diff options
| -rwxr-xr-x | t/t0000-basic.sh | 14 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index bc4e3e27b5..e6c5b63839 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -50,11 +50,11 @@ run_sub_test_lib_test () { shift 2 mkdir "$name" && ( - # Pretend we're a test harness. This prevents - # test-lib from writing the counts to a file that will - # later be summarized, showing spurious "failed" tests - HARNESS_ACTIVE=t && - export HARNESS_ACTIVE && + # Pretend we're not running under a test harness, whether we + # are or not. The test-lib output depends on the setting of + # this variable, so we need a stable setting under which to run + # the sub-test. + sane_unset HARNESS_ACTIVE && cd "$name" && cat >"$name.sh" <<-EOF && #!$SHELL_PATH @@ -235,16 +235,13 @@ test_expect_success 'test --verbose' ' grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out && check_sub_test_lib_test test-verbose <<-\EOF > expecting success: true - > Z > ok 1 - passing test > Z > expecting success: echo foo > foo - > Z > ok 2 - test with output > Z > expecting success: false - > Z > not ok 3 - failing test > # false > Z @@ -267,7 +264,6 @@ test_expect_success 'test --verbose-only' ' > Z > expecting success: echo foo > foo - > Z > ok 2 - test with output > Z > not ok 3 - failing test diff --git a/t/test-lib.sh b/t/test-lib.sh index b25249ec4c..f54a77c292 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -477,8 +477,6 @@ test_at_end_hook_ () { test_done () { GIT_EXIT_OK=t - # Note: t0000 relies on $HARNESS_ACTIVE disabling the .counts - # output file if test -z "$HARNESS_ACTIVE" then test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results" |