Skip to content

Commit

Permalink
Only run aggregate-results over actual counts
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Rast authored and Junio C Hamano committed Jul 16, 2010
1 parent e605164 commit 7ea3ddf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion t/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7ea3ddf

Please sign in to comment.