Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 29, 2013, 18:17 UTC
- Message-ID
- <7vwqrli4mb.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <87fvy9dxok.fsf@hexa.v.cablecom.net>
Thomas Rast <trast@inf.ethz.ch> writes:
Show 20 quoted lines
> John Keeping <john@keeping.me.uk> writes:
>> diff --git a/t/test-lib.sh b/t/test-lib.sh
>> index ca6bdef..70ad085 100644
>> --- a/t/test-lib.sh
>> +++ b/t/test-lib.sh
>> @@ -54,8 +54,8 @@ done,*)
>> # do not redirect again
>> ;;
>> *' --tee '*|*' --va'*)
>> - mkdir -p test-results
>> - BASE=test-results/$(basename "$0" .sh)
>> + mkdir -p "$(TEST_OUTPUT_DIRECTORY)/test-results"
>> + BASE="$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename "$0" .sh)"
>> (GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1;
>> echo $? > $BASE.exit) | tee $BASE.out
>> test "$(cat $BASE.exit)" = 0
>
> Hmm, I initially was too lazy to review this change, and now it's biting
> me. The above is Makefile-quoted, which to the shell reads like a
> command substitution.Heh, when I let my eyes coast over it I didn't notice them either. Everything in that patch is bad.
This squashed in?
t/test-lib.sh | 4 ++-- t/valgrind/analyze.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh index 1b1e843..e7d169c 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -54,8 +54,8 @@ done,*) # do not redirect again ;; *' --tee '*|*' --va'*) - mkdir -p "$(TEST_OUTPUT_DIRECTORY)/test-results" - BASE="$(TEST_OUTPUT_DIRECTORY)/test-results/$(basename "$0" .sh)" + mkdir -p "$TEST_OUTPUT_DIRECTORY/test-results" + BASE="$TEST_OUTPUT_DIRECTORY/test-results/$(basename "$0" .sh)" (GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1; echo $? > $BASE.exit) | tee $BASE.out test "$(cat $BASE.exit)" = 0 diff --git a/t/valgrind/analyze.sh b/t/valgrind/analyze.sh index 7b58f01..2ffc80f 100755 --- a/t/valgrind/analyze.sh +++ b/t/valgrind/analyze.sh @@ -119,7 +119,7 @@ handle_one () { finish_output } -for test_script in "$(TEST_OUTPUT_DIRECTORY)"/test-results/*.out +for test_script in "$TEST_OUTPUT_DIRECTORY"/test-results/*.out do handle_one $test_script done