undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0000: simplify HARNESS_ACTIVE hack

Browse Source 
Commit 517cd55 set HARNESS_ACTIVE unconditionally in
sub-tests, because that value affects the output of
"--verbose". t0000 needs stable output from its sub-tests,
and we may or may not be running under a TAP harness.

That commit made the decision to always set the variable,
since it has another useful side effect, which is
suppressing writes to t/test-results by the sub-tests (which
would just pollute the real results).

Since the last commit, though, the sub-tests have their own
test-results directories, so this is no longer an issue. We
can now update a few comments that are no longer accurate
nor necessary.

We can also revisit the choice of HARNESS_ACTIVE. Since we
must choose one value for stability, it's probably saner to
have it off. This means that future patches could test
things like the test-results writing, or the "--quiet"
option, which is currently ignored when run under a harness.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2013-12-28 04:31:49 -05:00 committed by Junio C Hamano
parent 6883047071
commit a63c12c9be
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t0000-basic.sh
View File

@ -50,11 +50,11 @@ run_sub_test_lib_test () {
shift 2 shift 2
mkdir "$name" && mkdir "$name" &&
( (
# Pretend we're a test harness. This prevents # Pretend we're not running under a test harness, whether we
# test-lib from writing the counts to a file that will # are or not. The test-lib output depends on the setting of
# later be summarized, showing spurious "failed" tests # this variable, so we need a stable setting under which to run
HARNESS_ACTIVE=t && # the sub-test.
export HARNESS_ACTIVE && sane_unset HARNESS_ACTIVE &&
cd "$name" && cd "$name" &&
cat >"$name.sh" <<-EOF && cat >"$name.sh" <<-EOF &&
#!$SHELL_PATH #!$SHELL_PATH
@ -235,16 +235,13 @@ test_expect_success 'test --verbose' '
grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out && grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
check_sub_test_lib_test test-verbose <<-\EOF check_sub_test_lib_test test-verbose <<-\EOF
> expecting success: true > expecting success: true
> Z
> ok 1 - passing test > ok 1 - passing test
> Z > Z
> expecting success: echo foo > expecting success: echo foo
> foo > foo
> Z
> ok 2 - test with output > ok 2 - test with output
> Z > Z
> expecting success: false > expecting success: false
> Z
> not ok 3 - failing test > not ok 3 - failing test
> # false > # false
> Z > Z
@ -267,7 +264,6 @@ test_expect_success 'test --verbose-only' '
> Z > Z
> expecting success: echo foo > expecting success: echo foo
> foo > foo
> Z
> ok 2 - test with output > ok 2 - test with output
> Z > Z
> not ok 3 - failing test > not ok 3 - failing test

2
t/test-lib.sh
View File

@ -477,8 +477,6 @@ test_at_end_hook_ () {
test_done () { test_done () {
GIT_EXIT_OK=t GIT_EXIT_OK=t
# Note: t0000 relies on $HARNESS_ACTIVE disabling the .counts
# output file
if test -z "$HARNESS_ACTIVE" if test -z "$HARNESS_ACTIVE"
then then
test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results" test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results"