diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:40:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:40:56 -0700 |
| commit | 6da9d5bf47de3fdea23447259a2f1ab220a1b18f (patch) | |
| tree | 57e657ccc3944d1c3fd4277b41dae967a2ee4f90 /t/test-lib.sh | |
| parent | Update draft release notes for 1.6.1 (diff) | |
| parent | Update t/.gitignore to ignore all trash directories (diff) | |
| download | tgif-6da9d5bf47de3fdea23447259a2f1ab220a1b18f.tar.xz | |
Merge branch 'js/parallel-test'
* js/parallel-test:
Update t/.gitignore to ignore all trash directories
Enable parallel tests
tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
t9700: remove useless check
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 11c027571b..7f60b614ea 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -449,6 +449,11 @@ test_done () { # we will leave things as they are. say_color pass "passed all $msg" + + test -d "$remove_trash" && + cd "$(dirname "$remove_trash")" && + rm -rf "$(basename "$remove_trash")" + exit 0 ;; *) @@ -485,7 +490,8 @@ fi . ../GIT-BUILD-OPTIONS # Test repository -test="trash directory" +test="trash directory.$(basename "$0" .sh)" +remove_trash="$TEST_DIRECTORY/$test" rm -fr "$test" || { trap - exit echo >&5 "FATAL: Cannot prepare test area" |