summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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