From 7ea3ddf818dbd59ae8002e98f56e60742746db45 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Fri, 16 Jul 2010 11:37:44 +0200 Subject: Only run aggregate-results over actual counts 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 Acked-by: Sverre Rabbelier Signed-off-by: Junio C Hamano --- t/Makefile | 2 +- t/test-lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/Makefile b/t/Makefile index f9de24b4d..cf5f9e2e1 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 db8371cb1..e5523dd69 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -636,7 +636,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 -- cgit v1.2.1