[git commit] sh testsuite: sync ash-vars/ and hush-vars/

[Denys Vlasenko]

commit: https://git.busybox.net/busybox/commit/?id=0ba99705a112d37822f34619b893cf7205a2663c
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash_test/ash-vars/var1.right                   | 10 ++++------
 shell/ash_test/ash-vars/var1.tests                   | 19 +++++++------------
 shell/ash_test/ash-vars/var2.right                   |  3 ++-
 shell/ash_test/ash-vars/var2.tests                   |  5 ++++-
 shell/ash_test/ash-vars/{var2.right => var4.right}   |  0
 shell/ash_test/ash-vars/{var2.tests => var4.tests}   |  0
 shell/ash_test/ash-vars/{var1.right => var5.right}   |  0
 shell/ash_test/ash-vars/{var1.tests => var5.tests}   |  0
 shell/hush_test/hush-vars/var3.is.in.bugs            |  0
 shell/hush_test/hush-vars/{var3.right => var6.right} |  0
 shell/hush_test/hush-vars/{var3.tests => var6.tests} |  0
 11 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/shell/ash_test/ash-vars/var1.right b/shell/ash_test/ash-vars/var1.right
index 2a01291..194e7db 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 802e489..48a6782 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 8fed138..40bf4bf 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 07feaeb..1292410 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/var2.right b/shell/ash_test/ash-vars/var4.right
similarity index 100%
copy from shell/ash_test/ash-vars/var2.right
copy to shell/ash_test/ash-vars/var4.right
diff --git a/shell/ash_test/ash-vars/var2.tests b/shell/ash_test/ash-vars/var4.tests
similarity index 100%
copy from shell/ash_test/ash-vars/var2.tests
copy to shell/ash_test/ash-vars/var4.tests
diff --git a/shell/ash_test/ash-vars/var1.right b/shell/ash_test/ash-vars/var5.right
similarity index 100%
copy from shell/ash_test/ash-vars/var1.right
copy to shell/ash_test/ash-vars/var5.right
diff --git a/shell/ash_test/ash-vars/var1.tests b/shell/ash_test/ash-vars/var5.tests
similarity index 100%
copy from shell/ash_test/ash-vars/var1.tests
copy to shell/ash_test/ash-vars/var5.tests
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 0000000..e69de29
diff --git a/shell/hush_test/hush-vars/var3.right b/shell/hush_test/hush-vars/var6.right
similarity index 100%
rename from shell/hush_test/hush-vars/var3.right
rename to shell/hush_test/hush-vars/var6.right
diff --git a/shell/hush_test/hush-vars/var3.tests b/shell/hush_test/hush-vars/var6.tests
similarity index 100%
rename from shell/hush_test/hush-vars/var3.tests
rename to shell/hush_test/hush-vars/var6.tests