test: simplify counts aggregation
When the list of files as input was implemented in 6508eedf67 (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 <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Mar 9, 2023 at 11:30 UTC
5d1d62e87540fd43bb16b123c9c73b022cc463e2
3 files changed
+3
-7
contrib/subtree/t/Makefile
+1
-3
@@ -74,9 +74,7 @@ aggregate-results-and-cleanup: $(T)
74
$(MAKE) clean
75
76
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)'
78
79
valgrind:
80
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
t/Makefile
+1
-3
@@ -140,9 +140,7 @@ aggregate-results-and-cleanup: $(T)
140
$(MAKE) clean
141
142
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)'
144
145
valgrind:
146
$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
t/aggregate-results.sh
+1
-1
@@ -8,7 +8,7 @@ broken=0
8
total=0
9
missing_prereq=
10
11
-while read file
11
+for file in "$1"/t*-*.counts
12
do
13
while read type value
14
do