diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-27 14:52:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-27 14:52:25 -0800 |
| commit | f6a129ceaf0b9a1e294fcb5abdaad3885b3a391d (patch) | |
| tree | e60e993371e9fae3de9e41860d40cc60a1d25486 /t/Makefile | |
| parent | 73b1808fa3f9cd7c0a6e5e5079a9715bade5f4a0 (diff) | |
| parent | 647b5e09987ac74e158d66ac2fd0036f2c9c99fe (diff) | |
| download | git-f6a129ceaf0b9a1e294fcb5abdaad3885b3a391d.tar.xz | |
Merge branch 'ps/chainlint-self-check-update'
Test framework update.
* ps/chainlint-self-check-update:
tests: adjust whitespace in chainlint expectations
Diffstat (limited to 't/Makefile')
| -rw-r--r-- | t/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/t/Makefile b/t/Makefile index 225aaf78ed..b7a6fefe28 100644 --- a/t/Makefile +++ b/t/Makefile @@ -103,20 +103,12 @@ check-chainlint: echo "# chainlint: $(CHAINLINTTMP_SQ)/tests" && \ for i in $(CHAINLINTTESTS); do \ echo "# chainlint: $$i" && \ - sed -e '/^[ ]*$$/d' chainlint/$$i.expect; \ + cat chainlint/$$i.expect; \ done \ } >'$(CHAINLINTTMP_SQ)'/expect && \ $(CHAINLINT) --emit-all '$(CHAINLINTTMP_SQ)'/tests | \ - sed -e 's/^[1-9][0-9]* //;/^[ ]*$$/d' >'$(CHAINLINTTMP_SQ)'/actual && \ - if test -f ../GIT-BUILD-OPTIONS; then \ - . ../GIT-BUILD-OPTIONS; \ - fi && \ - if test -x ../git$$X; then \ - DIFFW="../git$$X --no-pager diff -w --no-index"; \ - else \ - DIFFW="diff -w -u"; \ - fi && \ - $$DIFFW '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual + sed -e 's/^[1-9][0-9]* //' >'$(CHAINLINTTMP_SQ)'/actual && \ + diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \ test-lint-filenames |