mirror of
https://github.com/git/git.git
synced 2024-09-28 07:40:44 +02:00
t/Makefile: apply chainlint.pl to existing self-tests
Now that chainlint.pl is functional, take advantage of the existing chainlint self-tests to validate its operation. (While at it, stop validating chainlint.sed against the self-tests since it will soon be retired.) Due to chainlint.sed implementation limitations leaking into the self-test "expect" files, a few of them require minor adjustment to make them compatible with chainlint.pl which does not share those limitations. First, because `sed` does not provide any sort of real recursion, chainlint.sed only emulates recursion into subshells, and each level of recursion leads to a multiplicative increase in complexity of the `sed` rules. To avoid substantial complexity, chainlint.sed, therefore, only emulates subshell recursion one level deep. Any subshell deeper than that is passed through as-is, which means that &&-chains are not checked in deeper subshells. chainlint.pl, on the other hand, employs a proper recursive descent parser, thus checks subshells to any depth and correctly flags broken &&-chains in deep subshells. Second, due to sed's line-oriented nature, chainlint.sed, by necessity, folds multi-line quoted strings into a single line. chainlint.pl, on the other hand, employs a proper lexical analyzer which preserves quoted strings as-is, including embedded newlines. Furthermore, the output of chainlint.sed and chainlint.pl do not match precisely in terms of whitespace. However, since the purpose of the self-checks is to verify that the ?!AMP?! annotations are being correctly added, minor whitespace differences are immaterial. For this reason, rather than adjusting whitespace in all existing self-test "expect" files to match the new linter's output, the `check-chainlint` target ignores whitespace differences. Since `diff -w` is not POSIX, `check-chainlint` attempts to employ `git diff -w`, and only falls back to non-POSIX `diff -w` (and `-u`) if `git diff` is not available. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
35ebb1e37b
commit
d00113ec34
29
t/Makefile
29
t/Makefile
@ -38,7 +38,7 @@ T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
|
|||||||
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
|
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
|
||||||
TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
|
TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
|
||||||
CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
|
CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
|
||||||
CHAINLINT = sed -f chainlint.sed
|
CHAINLINT = '$(PERL_PATH_SQ)' chainlint.pl
|
||||||
|
|
||||||
all: $(DEFAULT_TEST_TARGET)
|
all: $(DEFAULT_TEST_TARGET)
|
||||||
|
|
||||||
@ -73,10 +73,29 @@ clean-chainlint:
|
|||||||
|
|
||||||
check-chainlint:
|
check-chainlint:
|
||||||
@mkdir -p '$(CHAINLINTTMP_SQ)' && \
|
@mkdir -p '$(CHAINLINTTMP_SQ)' && \
|
||||||
sed -e '/^# LINT: /d' $(patsubst %,chainlint/%.test,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/tests && \
|
for i in $(CHAINLINTTESTS); do \
|
||||||
sed -e '/^[ ]*$$/d' $(patsubst %,chainlint/%.expect,$(CHAINLINTTESTS)) >'$(CHAINLINTTMP_SQ)'/expect && \
|
echo "test_expect_success '$$i' '" && \
|
||||||
$(CHAINLINT) '$(CHAINLINTTMP_SQ)'/tests | grep -v '^[ ]*$$' >'$(CHAINLINTTMP_SQ)'/actual && \
|
sed -e '/^# LINT: /d' chainlint/$$i.test && \
|
||||||
diff -u '$(CHAINLINTTMP_SQ)'/expect '$(CHAINLINTTMP_SQ)'/actual
|
echo "'"; \
|
||||||
|
done >'$(CHAINLINTTMP_SQ)'/tests && \
|
||||||
|
{ \
|
||||||
|
echo "# chainlint: $(CHAINLINTTMP_SQ)/tests" && \
|
||||||
|
for i in $(CHAINLINTTESTS); do \
|
||||||
|
echo "# chainlint: $$i" && \
|
||||||
|
sed -e '/^[ ]*$$/d' chainlint/$$i.expect; \
|
||||||
|
done \
|
||||||
|
} >'$(CHAINLINTTMP_SQ)'/expect && \
|
||||||
|
$(CHAINLINT) --emit-all '$(CHAINLINTTMP_SQ)'/tests | \
|
||||||
|
grep -v '^[ ]*$$' >'$(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
|
||||||
|
|
||||||
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
|
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
|
||||||
test-lint-filenames
|
test-lint-filenames
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
(
|
(
|
||||||
foo &&
|
foo &&
|
||||||
{
|
{
|
||||||
echo a
|
echo a ?!AMP?!
|
||||||
echo b
|
echo b
|
||||||
} &&
|
} &&
|
||||||
bar &&
|
bar &&
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
(
|
(
|
||||||
cat <<-TXT && echo "multi-line string" ?!AMP?!
|
cat <<-TXT && echo "multi-line
|
||||||
|
string" ?!AMP?!
|
||||||
bap
|
bap
|
||||||
)
|
)
|
||||||
|
@ -1,9 +1,14 @@
|
|||||||
(
|
(
|
||||||
x="line 1 line 2 line 3" &&
|
x="line 1
|
||||||
y="line 1 line2" ?!AMP?!
|
line 2
|
||||||
|
line 3" &&
|
||||||
|
y="line 1
|
||||||
|
line2" ?!AMP?!
|
||||||
foobar
|
foobar
|
||||||
) &&
|
) &&
|
||||||
(
|
(
|
||||||
echo "xyz" "abc def ghi" &&
|
echo "xyz" "abc
|
||||||
|
def
|
||||||
|
ghi" &&
|
||||||
barfoo
|
barfoo
|
||||||
)
|
)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
) >file &&
|
) >file &&
|
||||||
cd foo &&
|
cd foo &&
|
||||||
(
|
(
|
||||||
echo a
|
echo a ?!AMP?!
|
||||||
echo b
|
echo b
|
||||||
) >file
|
) >file
|
||||||
)
|
)
|
||||||
|
@ -1,10 +1,17 @@
|
|||||||
(
|
(
|
||||||
chks="sub1sub2sub3sub4" &&
|
chks="sub1
|
||||||
|
sub2
|
||||||
|
sub3
|
||||||
|
sub4" &&
|
||||||
chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
|
chks_sub=$(cat <<TXT | sed "s,^,sub dir/,"
|
||||||
) &&
|
) &&
|
||||||
chkms="main-sub1main-sub2main-sub3main-sub4" &&
|
chkms="main-sub1
|
||||||
|
main-sub2
|
||||||
|
main-sub3
|
||||||
|
main-sub4" &&
|
||||||
chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
|
chkms_sub=$(cat <<TXT | sed "s,^,sub dir/,"
|
||||||
) &&
|
) &&
|
||||||
subfiles=$(git ls-files) &&
|
subfiles=$(git ls-files) &&
|
||||||
check_equal "$subfiles" "$chkms$chks"
|
check_equal "$subfiles" "$chkms
|
||||||
|
$chks"
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user