summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2023-06-24 01:35:51 +0100
committerBram Moolenaar <Bram@vim.org>2023-06-24 01:35:51 +0100
commit79186bee785081322c198f0074cb1f2d07764eb6 (patch)
treee8b4aeddba174e61d357e70e1973c0d3af929f18
parent7d0dbd0070fd8ed86b08f81f6acfad9a5fe55672 (diff)
patch 9.0.1657: one more syntax test depends on the systemv9.0.1657
Problem: One more syntax test depends on the system. Solution: Use "dash" instead of "sh".
-rw-r--r--runtime/syntax/testdir/dumps/sh_05_00.dump2
-rw-r--r--runtime/syntax/testdir/input/sh_05.sh2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/syntax/testdir/dumps/sh_05_00.dump b/runtime/syntax/testdir/dumps/sh_05_00.dump
index 4e662d559b..73164f0033 100644
--- a/runtime/syntax/testdir/dumps/sh_05_00.dump
+++ b/runtime/syntax/testdir/dumps/sh_05_00.dump
@@ -1,4 +1,4 @@
->#+0#0000e05#ffffff0|!|/|b|i|n|/|s|h| |-|x| +0#0000000&@62
+>#+0#0000e05#ffffff0|!|/|b|i|n|/|d|a|s|h| |-|x| +0#0000000&@60
|#+0#0000e05&| |s|h|5| +0#0000000&@69
|#+0#0000e05&| |N|o|t|e| |t|h|a|t| |t|h|i|s| |i|s| |s|p|e|c|i|a|l| |f|o|r| |s|h|.| |k|s|h| |w|i|l@1| |b|e| |a|n| |e|x|t|r|a| |f|i|l|e| |l|a|t|e|r|.| +0#0000000&@6
|#+0#0000e05&| |N|o|t|e| |t|o@1|,| |t|h|a|t| |s|h| |a|n|d| |k|s|h| |a|l@1|o|w| |$|{|v|a|r|:|-|s|u|b|}| |a|s| |w|e|l@1| |a|s| |$|{|v|a|r|-|s|u|b|}|!| +0#0000000&@6
diff --git a/runtime/syntax/testdir/input/sh_05.sh b/runtime/syntax/testdir/input/sh_05.sh
index e86c834e73..87381e12ea 100644
--- a/runtime/syntax/testdir/input/sh_05.sh
+++ b/runtime/syntax/testdir/input/sh_05.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/dash -x
# sh5
# Note that this is special for sh. ksh will be an extra file later.
# Note too, that sh and ksh allow ${var:-sub} as well as ${var-sub}!
diff --git a/src/version.c b/src/version.c
index 535afe777c..f847175289 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1657,
+/**/
1656,
/**/
1655,