aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-28 00:41:50 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-28 00:41:50 -0700
commit9d5156496d2d32800df52fa372295c16ab2578f0 (patch)
treefad95db756d46083c1c948c1b44cddf9896f98c5 /t
parenta8fac795ddaa004835fc688560cf19ca5500ce8d (diff)
parent81db4abf84ec7fbebeb08f6ad506138da2e7e4cd (diff)
downloadgit-9d5156496d2d32800df52fa372295c16ab2578f0.tar.gz
git-9d5156496d2d32800df52fa372295c16ab2578f0.tar.xz
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: test-lib: Clean up comments and Makefile. diff --no-index: Do not generate patch output if other output is requested
Diffstat (limited to 't')
-rw-r--r--t/Makefile2
-rw-r--r--t/test-lib.sh8
2 files changed, 1 insertions, 9 deletions
diff --git a/t/Makefile b/t/Makefile
index ed49c20b1..914937303 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -24,7 +24,7 @@ pre-clean:
$(RM) -r test-results
clean:
- $(RM) -r 'trash directory' test-results
+ $(RM) -r 'trash directory'.* test-results
aggregate-results-and-cleanup: $(T)
$(MAKE) aggregate-results
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0c455929e..59d82d25e 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -466,14 +466,6 @@ test_done () {
fi
case "$test_failure" in
0)
- # We could:
- # cd .. && rm -fr 'trash directory'
- # but that means we forbid any tests that use their own
- # subdirectory from calling test_done without coming back
- # to where they started from.
- # The Makefile provided will clean this test area so
- # we will leave things as they are.
-
say_color pass "passed all $msg"
test -d "$remove_trash" &&