From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 2 Oct 2016 16:17:15 +0000 (+0200)
Subject: sh testsuite: sync ash-vars/ and hush-vars/
X-Git-Tag: 1_26_0~185
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0ba99705a112d37822f34619b893cf7205a2663c;p=oweals%2Fbusybox.git

sh testsuite: sync ash-vars/ and hush-vars/

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/shell/ash_test/ash-vars/var1.right b/shell/ash_test/ash-vars/var1.right
index 2a01291bb..194e7dbe2 100644
--- a/shell/ash_test/ash-vars/var1.right
+++ b/shell/ash_test/ash-vars/var1.right
@@ -1,6 +1,4 @@
-a=a A=a
-a=a A=a
-a= A=
-a= A=
-a=a A=a
-a=a A=a
+http://busybox.net
+http://busybox.net_abc
+1 1
+1 1
diff --git a/shell/ash_test/ash-vars/var1.tests b/shell/ash_test/ash-vars/var1.tests
index 802e489bd..48a6782ba 100755
--- a/shell/ash_test/ash-vars/var1.tests
+++ b/shell/ash_test/ash-vars/var1.tests
@@ -1,14 +1,9 @@
-# check that first assignment has proper effect on second one
+URL=http://busybox.net
 
-(
-a=a A=$a
-echo a=$a A=$A
-)
-(a=a A=$a; echo a=$a A=$A)
-(a=a A=$a echo a=$a A=$A)
-(a=a A=$a /bin/echo a=$a A=$A)
+echo $URL
+echo ${URL}_abc
 
-f() { echo a=$a A=$A; }
-
-(a=a A=$a f)
-(a=a A=$a; f)
+true
+false; echo $? ${?}
+true
+{ false; echo $? ${?}; }
diff --git a/shell/ash_test/ash-vars/var2.right b/shell/ash_test/ash-vars/var2.right
index 8fed138eb..40bf4bff4 100644
--- a/shell/ash_test/ash-vars/var2.right
+++ b/shell/ash_test/ash-vars/var2.right
@@ -1 +1,2 @@
-bus/usb/1/2
+http://busybox.net
+http://busybox.net_abc
diff --git a/shell/ash_test/ash-vars/var2.tests b/shell/ash_test/ash-vars/var2.tests
index 07feaeb8b..1292410f3 100755
--- a/shell/ash_test/ash-vars/var2.tests
+++ b/shell/ash_test/ash-vars/var2.tests
@@ -1 +1,4 @@
-X=usbdev1.2 X=${X#usbdev} B=${X%%.*} D=${X#*.}; echo bus/usb/$B/$D
+_1=http://busybox.net
+
+echo $_1
+echo ${_1}_abc
diff --git a/shell/ash_test/ash-vars/var4.right b/shell/ash_test/ash-vars/var4.right
new file mode 100644
index 000000000..8fed138eb
--- /dev/null
+++ b/shell/ash_test/ash-vars/var4.right
@@ -0,0 +1 @@
+bus/usb/1/2
diff --git a/shell/ash_test/ash-vars/var4.tests b/shell/ash_test/ash-vars/var4.tests
new file mode 100755
index 000000000..07feaeb8b
--- /dev/null
+++ b/shell/ash_test/ash-vars/var4.tests
@@ -0,0 +1 @@
+X=usbdev1.2 X=${X#usbdev} B=${X%%.*} D=${X#*.}; echo bus/usb/$B/$D
diff --git a/shell/ash_test/ash-vars/var5.right b/shell/ash_test/ash-vars/var5.right
new file mode 100644
index 000000000..2a01291bb
--- /dev/null
+++ b/shell/ash_test/ash-vars/var5.right
@@ -0,0 +1,6 @@
+a=a A=a
+a=a A=a
+a= A=
+a= A=
+a=a A=a
+a=a A=a
diff --git a/shell/ash_test/ash-vars/var5.tests b/shell/ash_test/ash-vars/var5.tests
new file mode 100755
index 000000000..802e489bd
--- /dev/null
+++ b/shell/ash_test/ash-vars/var5.tests
@@ -0,0 +1,14 @@
+# check that first assignment has proper effect on second one
+
+(
+a=a A=$a
+echo a=$a A=$A
+)
+(a=a A=$a; echo a=$a A=$A)
+(a=a A=$a echo a=$a A=$A)
+(a=a A=$a /bin/echo a=$a A=$A)
+
+f() { echo a=$a A=$A; }
+
+(a=a A=$a f)
+(a=a A=$a; f)
diff --git a/shell/hush_test/hush-vars/var3.is.in.bugs b/shell/hush_test/hush-vars/var3.is.in.bugs
new file mode 100644
index 000000000..e69de29bb
diff --git a/shell/hush_test/hush-vars/var3.right b/shell/hush_test/hush-vars/var3.right
deleted file mode 100644
index 40e67fdf5..000000000
--- a/shell/hush_test/hush-vars/var3.right
+++ /dev/null
@@ -1,2 +0,0 @@
-hush: invalid number '1q'
-hush: syntax error: unterminated ${name}
diff --git a/shell/hush_test/hush-vars/var3.tests b/shell/hush_test/hush-vars/var3.tests
deleted file mode 100755
index aea36d62d..000000000
--- a/shell/hush_test/hush-vars/var3.tests
+++ /dev/null
@@ -1,4 +0,0 @@
-# reject invalid vars
-"$THIS_SH" -c 'echo ${1q}'
-"$THIS_SH" -c 'echo ${&}'
-#"$THIS_SH" -c 'echo ${$}' -- this is valid as it's the same as $$
diff --git a/shell/hush_test/hush-vars/var6.right b/shell/hush_test/hush-vars/var6.right
new file mode 100644
index 000000000..40e67fdf5
--- /dev/null
+++ b/shell/hush_test/hush-vars/var6.right
@@ -0,0 +1,2 @@
+hush: invalid number '1q'
+hush: syntax error: unterminated ${name}
diff --git a/shell/hush_test/hush-vars/var6.tests b/shell/hush_test/hush-vars/var6.tests
new file mode 100755
index 000000000..aea36d62d
--- /dev/null
+++ b/shell/hush_test/hush-vars/var6.tests
@@ -0,0 +1,4 @@
+# reject invalid vars
+"$THIS_SH" -c 'echo ${1q}'
+"$THIS_SH" -c 'echo ${&}'
+#"$THIS_SH" -c 'echo ${$}' -- this is valid as it's the same as $$