Skip to content

Commit 7ea3ddf

Browse files
trastgitster
authored andcommitted
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 <[email protected]> Acked-by: Sverre Rabbelier <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e605164 commit 7ea3ddf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ aggregate-results-and-cleanup: $(T)
3636
$(MAKE) clean
3737

3838
aggregate-results:
39-
for f in test-results/t*-*; do \
39+
for f in test-results/t*-*.counts; do \
4040
echo "$$f"; \
4141
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
4242

t/test-lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ test_done () {
636636
GIT_EXIT_OK=t
637637
test_results_dir="$TEST_DIRECTORY/test-results"
638638
mkdir -p "$test_results_dir"
639-
test_results_path="$test_results_dir/${0%.sh}-$$"
639+
test_results_path="$test_results_dir/${0%.sh}-$$.counts"
640640

641641
echo "total $test_count" >> $test_results_path
642642
echo "success $test_success" >> $test_results_path

0 commit comments

Comments
 (0)