Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2021-12-13 09:30:45 +0300
committerJunio C Hamano <gitster@pobox.com>2021-12-14 01:15:28 +0300
commit925d7304d2a5f5dda9fbe3f541338bb87083f6b2 (patch)
tree2ea7dd7677b25551681ccda8a5053a938dbe7025 /t/chainlint
parente773545c7fe7eca21b134847f4fc2cbc9547fa14 (diff)
t/chainlint/*.test: don't use invalid shell syntax
The chainlint self-test code snippets are supposed to represent the body of a test_expect_success() or test_expect_failure(), yet the contents of these tests would have caused the shell to report syntax errors had they been real test bodies. Although chainlint.sed, with its simplistic heuristics, is blind to these syntactic problems, a future more robust chainlint implementation might not have such a limitation, so make these snippets syntactically valid. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/chainlint')
-rw-r--r--t/chainlint/if-then-else.expect5
-rw-r--r--t/chainlint/if-then-else.test3
-rw-r--r--t/chainlint/subshell-here-doc.test2
3 files changed, 6 insertions, 4 deletions
diff --git a/t/chainlint/if-then-else.expect b/t/chainlint/if-then-else.expect
index 5953c7bfbc..a80f5e6c75 100644
--- a/t/chainlint/if-then-else.expect
+++ b/t/chainlint/if-then-else.expect
@@ -4,6 +4,7 @@
?!AMP?! echo very
echo empty
elif test -z ""
+ then
echo foo
else
echo foo &&
@@ -14,6 +15,6 @@
(
if test -n ""; then
echo very &&
-?!AMP?! echo empty
- if
+ echo empty
+ fi
>)
diff --git a/t/chainlint/if-then-else.test b/t/chainlint/if-then-else.test
index 9bd8e9a4c6..d2b03ca6b4 100644
--- a/t/chainlint/if-then-else.test
+++ b/t/chainlint/if-then-else.test
@@ -7,6 +7,7 @@
# LINT: last statement before 'elif' does not need "&&"
echo empty
elif test -z ""
+ then
# LINT: last statement before 'else' does not need "&&"
echo foo
else
@@ -24,5 +25,5 @@
if test -n ""; then
echo very &&
echo empty
- if
+ fi
)
diff --git a/t/chainlint/subshell-here-doc.test b/t/chainlint/subshell-here-doc.test
index f6b3ba4214..0cce907ba8 100644
--- a/t/chainlint/subshell-here-doc.test
+++ b/t/chainlint/subshell-here-doc.test
@@ -11,7 +11,7 @@
# LINT: missing "&&" on 'cat'
cat <<EOF >bip
fish fly high
- EOF
+EOF
# LINT: swallow here-doc (EOF is last line of subshell)
echo <<-\EOF >bop