From b41aab78f2380c79512b1ed953f77acd86414dfb Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 7 Dec 2010 14:24:00 -0800 Subject: [PATCH] test: Leave tmp. for broken tests Previously, this directory was only preserved for failing tests. But it's important to be able to easily debug known-broken tests, so preserve the actual vs. expected output for those as well. --- test/basic | 1 + test/test-lib.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/test/basic b/test/basic index 309779ca..b4410f2a 100755 --- a/test/basic +++ b/test/basic @@ -71,6 +71,7 @@ output=$(cd ..; ./test-verbose -v 2>&1 | suppress_diff_date) expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) # Do not include the results of test-verbose in totals rm $TEST_DIRECTORY/test-results/test-verbose-* +rm -r $TEST_DIRECTORY/tmp.test-verbose test_expect_equal "$output" "$expected" diff --git a/test/test-lib.sh b/test/test-lib.sh index da91de8d..a1978279 100755 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -454,6 +454,9 @@ test_expect_equal_failure () test_known_broken_ok_ "$test_subtest_name" else test_known_broken_failure_ "$test_subtest_name" + testname=$this_test.$test_count + echo "$expected" > $testname.expected + echo "$output" > $testname.output fi fi } @@ -754,7 +757,9 @@ test_done () { echo if [ "$test_failure" = "0" ]; then - rm -rf "$remove_tmp" + if [ "$test_broken" = "0" ]; then + rm -rf "$remove_tmp" + fi exit 0 else exit 1