diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-11 17:41:48 -0700 |
| commit | e2af9e361b1d7452492baa073790b19292f9c038 (patch) | |
| tree | e717ab3c92aecf5c4c06627daef025506d2c6335 /t | |
| parent | Update dtaft release notes to 1.8.3 (diff) | |
| parent | Typo fix: replacing it's -> its (diff) | |
| download | tgif-e2af9e361b1d7452492baa073790b19292f9c038.tar.xz | |
Merge branch 'maint'
* maint:
Typo fix: replacing it's -> its
t: make PIPE a standard test prerequisite
archive: clarify explanation of --worktree-attributes
t/README: --immediate skips cleanup commands for failed tests
Diffstat (limited to 't')
| -rw-r--r-- | t/README | 10 | ||||
| -rwxr-xr-x | t/t9010-svn-fe.sh | 8 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 8 | ||||
| -rw-r--r-- | t/test-lib.sh | 5 |
4 files changed, 14 insertions, 17 deletions
@@ -86,7 +86,10 @@ appropriately before running "make". --immediate:: This causes the test to immediately exit upon the first - failed test. + failed test. Cleanup commands requested with + test_when_finished are not executed if the test failed, + in order to keep the state for inspection by the tester + to diagnose the bug. --long-tests:: This causes additional long-running tests to be run (where @@ -619,6 +622,11 @@ use these, and "test_set_prereq" for how to define your own. The process retains the same pid across exec(2). See fb9a2bea for details. + - PIPE + + The filesystem we're on supports creation of FIFOs (named pipes) + via mkfifo(1). + - SYMLINKS The filesystem we're on supports symbolic links. E.g. a FAT diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh index b7eed2489f..6dafe7e99a 100755 --- a/t/t9010-svn-fe.sh +++ b/t/t9010-svn-fe.sh @@ -54,14 +54,6 @@ text_no_props () { >empty -test_expect_success 'setup: have pipes?' ' - rm -f frob && - if mkfifo frob - then - test_set_prereq PIPE - fi -' - test_expect_success PIPE 'empty dump' ' reinit_git && echo "SVN-fs-dump-format-version: 2" >input && diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 2fcf269469..ac6f3b6af2 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -49,14 +49,6 @@ echo "$@"' >empty -test_expect_success 'setup: have pipes?' ' - rm -f frob && - if mkfifo frob - then - test_set_prereq PIPE - fi -' - ### ### series A ### diff --git a/t/test-lib.sh b/t/test-lib.sh index da57a2f45c..debd8b4751 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -735,6 +735,11 @@ test_i18ngrep () { fi } +test_lazy_prereq PIPE ' + # test whether the filesystem supports FIFOs + rm -f testfifo && mkfifo testfifo +' + test_lazy_prereq SYMLINKS ' # test whether the filesystem supports symbolic links ln -s x y && test -h y |