diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-21 14:18:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 14:18:56 -0700 |
| commit | ba235249c04a054398953c6f81db2f803a6943c9 (patch) | |
| tree | f3e7b9c9119497b1326de33a91bcea11c3ef33df | |
| parent | ea09dff59a99ff78a36e79fa1a27a509c75be852 (diff) | |
| parent | 90ff7c9898f6dfd76aae39ad06b1d0e746a615b8 (diff) | |
Merge branch 'fc/test-aggregation-clean-up'
Code clean-up for test framework.
* fc/test-aggregation-clean-up:
test: don't print aggregate-results command
test: simplify counts aggregation
| -rw-r--r-- | contrib/subtree/t/Makefile | 4 | ||||
| -rw-r--r-- | t/Makefile | 4 | ||||
| -rwxr-xr-x | t/aggregate-results.sh | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/contrib/subtree/t/Makefile b/contrib/subtree/t/Makefile index 4655e0987b..093399c788 100644 --- a/contrib/subtree/t/Makefile +++ b/contrib/subtree/t/Makefile @@ -74,9 +74,7 @@ aggregate-results-and-cleanup: $(T) $(MAKE) clean aggregate-results: - for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \ - echo "$$f"; \ - done | '$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh + @'$(SHELL_PATH_SQ)' ../../../t/aggregate-results.sh '$(TEST_RESULTS_DIRECTORY_SQ)' valgrind: $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind" diff --git a/t/Makefile b/t/Makefile index 2c2b252240..88fa504957 100644 --- a/t/Makefile +++ b/t/Makefile @@ -140,9 +140,7 @@ aggregate-results-and-cleanup: $(T) $(MAKE) clean aggregate-results: - for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \ - echo "$$f"; \ - done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh + @'$(SHELL_PATH_SQ)' ./aggregate-results.sh '$(TEST_RESULTS_DIRECTORY_SQ)' valgrind: $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind" diff --git a/t/aggregate-results.sh b/t/aggregate-results.sh index 7f2b83bdc8..6e3bcc4aec 100755 --- a/t/aggregate-results.sh +++ b/t/aggregate-results.sh @@ -8,7 +8,7 @@ broken=0 total=0 missing_prereq= -while read file +for file in "$1"/t*-*.counts do while read type value do |