Skip to content

Commit 5d1d62e

Browse files
felipecgitster
authored andcommitted
test: simplify counts aggregation
When the list of files as input was implemented in 6508eed (t/aggregate-results: accomodate systems with small max argument list length, 2010-06-01), a much simpler solution wasn't considered. Let's just pass the directory as an argument. Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 725f570 commit 5d1d62e

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

contrib/subtree/t/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ aggregate-results-and-cleanup: $(T)
7474
$(MAKE) clean
7575

7676
aggregate-results:
77-
for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
78-
echo "$$f"; \
79-
done | '$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh
77+
'$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh '$(TEST_RESULTS_DIRECTORY_SQ)'
8078

8179
valgrind:
8280
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"

t/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ aggregate-results-and-cleanup: $(T)
140140
$(MAKE) clean
141141

142142
aggregate-results:
143-
for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
144-
echo "$$f"; \
145-
done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
143+
'$(SHELL_PATH_SQ)' ./aggregate-results.sh '$(TEST_RESULTS_DIRECTORY_SQ)'
146144

147145
valgrind:
148146
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"

t/aggregate-results.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ broken=0
88
total=0
99
missing_prereq=
1010

11-
while read file
11+
for file in "$1"/t*-*.counts
1212
do
1313
while read type value
1414
do

0 commit comments

Comments
 (0)