[PATCH] Only run aggregate-results over actual counts
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jun 15, 2010, 21:36 UTC
- Message-ID
- <e10dd00b7a2064c71c9a509e2a7e82c935a60441.1276637243.git.trast@student.ethz.ch>
The current make target 'aggregate-results' scanned all files matching test-results/t*-*. Normally these are only the test counts (and the exit values, which are ignored), but with --tee the suite also dumps all output. Furthermore, with --verbose t1450 contains several lines starting with "broken link from ..." which matches the criteria used by aggregate-results.sh.
Rename the counts output files to *.counts, and only scan those.
Signed-off-by: Thomas Rast <trast@student.ethz.ch> ---
Did this ever work? Or was just nobody crazy enough to run all tests with --tee --valgrind?
t/Makefile | 2 +- t/test-lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/Makefile b/t/Makefile index f9de24b..cf5f9e2 100644 --- a/t/Makefile +++ b/t/Makefile @@ -36,7 +36,7 @@ aggregate-results-and-cleanup: $(T) $(MAKE) clean aggregate-results: - for f in test-results/t*-*; do \ + for f in test-results/t*-*.counts; do \ echo "$$f"; \ done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh diff --git a/t/test-lib.sh b/t/test-lib.sh index 37987d7..7e2cd7d 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -547,7 +547,7 @@ test_done () { GIT_EXIT_OK=t test_results_dir="$TEST_DIRECTORY/test-results" mkdir -p "$test_results_dir" - test_results_path="$test_results_dir/${0%.sh}-$$" + test_results_path="$test_results_dir/${0%.sh}-$$.counts" echo "total $test_count" >> $test_results_path echo "success $test_success" >> $test_results_path
-- 1.7.1.608.g80d39f