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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
author: Denys Vlasenko <vda.linux@googlemail.com> 2016-10-02 18:17:15 +0200
committer: Denys Vlasenko <vda.linux@googlemail.com> 2016-10-02 18:17:15 +0200
commit: 0ba99705a112d37822f34619b893cf7205a2663c (patch)
tree: 225768b5b4075e3d535754066171fcc1d7b7ac74
parent: e3354bc44aa92c20bec0ffdc78e6b57351e8f16d (diff)
download: busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.tar.gz
busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.tar.bz2
busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.zip
11 files changed, 39 insertions, 20 deletions
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
+http://busybox.net
-a=a A=a
+http://busybox.net_abc
-a= A=
+1 1
-a= A=
+1 1
-a=a A=a
-a=a A=a
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
-(
+echo $URL
-a=a A=$a
+echo ${URL}_abc
-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; }
+true
+false; echo $? ${?}
-(a=a A=$a f)
+true
-(a=a A=$a; f)
+{ 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
--- /dev/null
+++ b/shell/hush_test/hush-vars/var3.is.in.bugs
diff --git a/shell/hush_test/hush-vars/var3.right b/shell/hush_test/hush-vars/var6.right
index 40e67fdf5..40e67fdf5 100644
--- a/shell/hush_test/hush-vars/var3.right
+++ b/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
index aea36d62d..aea36d62d 100755
--- a/shell/hush_test/hush-vars/var3.tests
+++ b/shell/hush_test/hush-vars/var6.tests
author	Denys Vlasenko <vda.linux@googlemail.com>	2016-10-02 18:17:15 +0200
committer	Denys Vlasenko <vda.linux@googlemail.com>	2016-10-02 18:17:15 +0200
commit	0ba99705a112d37822f34619b893cf7205a2663c (patch)
tree	225768b5b4075e3d535754066171fcc1d7b7ac74
parent	e3354bc44aa92c20bec0ffdc78e6b57351e8f16d (diff)
download	busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.tar.gz busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.tar.bz2 busybox-w32-0ba99705a112d37822f34619b893cf7205a2663c.zip

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 @@
1	a=a A=a	1	http://busybox.net
2	a=a A=a	2	http://busybox.net_abc
3	a= A=	3	1 1
4	a= A=	4	1 1
5	a=a A=a
6	a=a A=a


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 @@
1	# check that first assignment has proper effect on second one	1	URL=http://busybox.net
2		2
3	(	3	echo $URL
4	a=a A=$a	4	echo ${URL}_abc
5	echo a=$a A=$A
6	)
7	(a=a A=$a; echo a=$a A=$A)
8	(a=a A=$a echo a=$a A=$A)
9	(a=a A=$a /bin/echo a=$a A=$A)
10		5
11	f() { echo a=$a A=$A; }	6	true
12		7	false; echo $? ${?}
13	(a=a A=$a f)	8	true
14	(a=a A=$a; f)	9	{ 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 @@
1	bus/usb/1/2	1	http://busybox.net
		2	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 @@
1	X=usbdev1.2 X=${X#usbdev} B=${X%%.} D=${X#.}; echo bus/usb/$B/$D	1	_1=http://busybox.net
		2
		3	echo $_1
		4	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 @@
		1	a=a A=a
		2	a=a A=a
		3	a= A=
		4	a= A=
		5	a=a A=a
		6	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 @@
		1	# check that first assignment has proper effect on second one
		2
		3	(
		4	a=a A=$a
		5	echo a=$a A=$A
		6	)
		7	(a=a A=$a; echo a=$a A=$A)
		8	(a=a A=$a echo a=$a A=$A)
		9	(a=a A=$a /bin/echo a=$a A=$A)
		10
		11	f() { echo a=$a A=$A; }
		12
		13	(a=a A=$a f)
		14	(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 --- /dev/null +++ b/shell/hush_test/hush-vars/var3.is.in.bugs


diff --git a/shell/hush_test/hush-vars/var3.right b/shell/hush_test/hush-vars/var6.right index 40e67fdf5..40e67fdf5 100644 --- a/shell/hush_test/hush-vars/var3.right +++ b/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 index aea36d62d..aea36d62d 100755 --- a/shell/hush_test/hush-vars/var3.tests +++ b/shell/hush_test/hush-vars/var6.tests