aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-07-16 11:37:44 +0200
committerJunio C Hamano <gitster@pobox.com>2010-07-16 13:25:01 -0700
commit7ea3ddf818dbd59ae8002e98f56e60742746db45 (patch)
treee6ee506a5c9cb15a285cfa8b71ef6ea014bba027 /t
parente605164d1da51087882a468bcf3f5d36d3a9d4ba (diff)
downloadgit-7ea3ddf818dbd59ae8002e98f56e60742746db45.tar.gz
git-7ea3ddf818dbd59ae8002e98f56e60742746db45.tar.xz
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>
Diffstat (limited to 't')
-rw-r--r--t/Makefile2
-rw-r--r--t/test-lib.sh2
2 files changed, 2 insertions, 2 deletions
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