diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:29:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:29:11 (GMT) |
| commit | 31d176d08383012f9cbd040636151e22724b5ee7 (patch) | |
| tree | c6e07533809175d77c3a7db45f63db81674d1a02 /t/valgrind | |
| parent | 7e2d574c37c6d53f09ceeb650f7af001aa50e987 (diff) | |
| parent | b3e0c4ed07e9f76e501c67c3677776e4f257d274 (diff) | |
| download | git-31d176d08383012f9cbd040636151e22724b5ee7.zip git-31d176d08383012f9cbd040636151e22724b5ee7.tar.gz git-31d176d08383012f9cbd040636151e22724b5ee7.tar.bz2 | |
Merge branch 'jk/test-output'
When TEST_OUTPUT_DIRECTORY setting is used, it was handled somewhat
inconsistently between the test framework and t/Makefile, and logic
to summarize the results looked at a wrong place.
* jk/test-output:
t/Makefile: don't define TEST_RESULTS_DIRECTORY recursively
test output: respect $TEST_OUTPUT_DIRECTORY
t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORY
Diffstat (limited to 't/valgrind')
| -rwxr-xr-x | t/valgrind/analyze.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/valgrind/analyze.sh b/t/valgrind/analyze.sh index d8105d9..2ffc80f 100755 --- a/t/valgrind/analyze.sh +++ b/t/valgrind/analyze.sh @@ -1,6 +1,10 @@ #!/bin/sh -out_prefix=$(dirname "$0")/../test-results/valgrind.out +# Get TEST_OUTPUT_DIRECTORY from GIT-BUILD-OPTIONS if it's there... +. "$(dirname "$0")/../../GIT-BUILD-OPTIONS" +# ... otherwise set it to the default value. +: ${TEST_OUTPUT_DIRECTORY=$(dirname "$0")/..} + output= count=0 total_count=0 @@ -115,7 +119,7 @@ handle_one () { finish_output } -for test_script in "$(dirname "$0")"/../test-results/*.out +for test_script in "$TEST_OUTPUT_DIRECTORY"/test-results/*.out do handle_one $test_script done |