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 <trast@student.ethz.ch> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Jul 16, 2010 at 11:37 UTC
7ea3ddf818dbd59ae8002e98f56e60742746db45
2 files changed
+2
-2
t/Makefile
+1
-1
@@ -36,7 +36,7 @@ aggregate-results-and-cleanup: $(T)
36
$(MAKE) clean
37
38
aggregate-results:
39
- for f in test-results/t*-*; do \
39
+ for f in test-results/t*-*.counts; do \
40
echo "$$f"; \
41
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
42
t/test-lib.sh
+1
-1
@@ -636,7 +636,7 @@ test_done () {
636
GIT_EXIT_OK=t
637
test_results_dir="$TEST_DIRECTORY/test-results"
638
mkdir -p "$test_results_dir"
639
- test_results_path="$test_results_dir/${0%.sh}-$$"
639
+ test_results_path="$test_results_dir/${0%.sh}-$$.counts"
640
641
echo "total $test_count" >> $test_results_path
642
echo "success $test_success" >> $test_results_path