8 files changed, 38 insertions, 27 deletions
diff --git a/shell/hush_test/hush-misc/source1.right b/shell/hush_test/hush-misc/source1.right
index d4256034b..0ab7c548c 100644
--- a/shell/hush_test/hush-misc/source1.right
+++ b/shell/hush_test/hush-misc/source1.right
@@ -1,5 +1,2 @@
-hush: syntax error: unterminated ${name}
+Sourced ok
-line2
+Done
-Ok1:0
-hush: syntax error: unterminated '
-Ok2:1
diff --git a/shell/hush_test/hush-misc/source1.tests b/shell/hush_test/hush-misc/source1.tests
index c13888359..e2e75b227 100755
--- a/shell/hush_test/hush-misc/source1.tests
+++ b/shell/hush_test/hush-misc/source1.tests
@@ -1,10 +1,5 @@
-echo 'echo ${^}
+echo "echo Sourced ok" >../sourced.sh
-echo line2' >sourced1
+PATH="..:$PATH"
-. ./sourced1
+. sourced.sh
-echo Ok1:$?
+rm ../sourced.sh
+echo Done
-echo "echo '" >sourced1
-. ./sourced1
-echo Ok2:$?
-rm sourced1
diff --git a/shell/hush_test/hush-misc/source2.right b/shell/hush_test/hush-misc/source2.right
index 0587bad67..ce7171c87 100644
--- a/shell/hush_test/hush-misc/source2.right
+++ b/shell/hush_test/hush-misc/source2.right
@@ -1,4 +1 @@
-0:arg0 1:arg1 2:arg2
+Done: 0
-Ok1:0
-0:arg0 1:q 2:w
-Ok2:0
diff --git a/shell/hush_test/hush-misc/source2.tests b/shell/hush_test/hush-misc/source2.tests
index 40b6b83cd..1870cdf7e 100755
--- a/shell/hush_test/hush-misc/source2.tests
+++ b/shell/hush_test/hush-misc/source2.tests
@@ -1,8 +1,3 @@
-echo 'echo "0:$0 1:$1 2:$2"' >sourced1
+false
-set -- 1 2 3
+. /dev/null
-"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2
+echo Done: $?
-echo Ok1:$?
-"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
-echo Ok2:$?
-rm sourced1
diff --git a/shell/hush_test/hush-misc/source4.right b/shell/hush_test/hush-misc/source4.right
new file mode 100644
index 000000000..d4256034b
--- /dev/null
+++ b/shell/hush_test/hush-misc/source4.right
@@ -0,0 +1,5 @@
+hush: syntax error: unterminated ${name}
+line2
+Ok1:0
+hush: syntax error: unterminated '
+Ok2:1
diff --git a/shell/hush_test/hush-misc/source4.tests b/shell/hush_test/hush-misc/source4.tests
new file mode 100755
index 000000000..c13888359
--- /dev/null
+++ b/shell/hush_test/hush-misc/source4.tests
@@ -0,0 +1,10 @@
+echo 'echo ${^}
+echo line2' >sourced1
+. ./sourced1
+echo Ok1:$?
+echo "echo '" >sourced1
+. ./sourced1
+echo Ok2:$?
+rm sourced1
diff --git a/shell/hush_test/hush-misc/source5.right b/shell/hush_test/hush-misc/source5.right
new file mode 100644
index 000000000..0587bad67
--- /dev/null
+++ b/shell/hush_test/hush-misc/source5.right
@@ -0,0 +1,4 @@
+0:arg0 1:arg1 2:arg2
+Ok1:0
+0:arg0 1:q 2:w
+Ok2:0
diff --git a/shell/hush_test/hush-misc/source5.tests b/shell/hush_test/hush-misc/source5.tests
new file mode 100755
index 000000000..40b6b83cd
--- /dev/null
+++ b/shell/hush_test/hush-misc/source5.tests
@@ -0,0 +1,8 @@
+echo 'echo "0:$0 1:$1 2:$2"' >sourced1
+set -- 1 2 3
+"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2
+echo Ok1:$?
+"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
+echo Ok2:$?
+rm sourced1

diff --git a/shell/hush_test/hush-misc/source1.right b/shell/hush_test/hush-misc/source1.right index d4256034b..0ab7c548c 100644 --- a/shell/hush_test/hush-misc/source1.right +++ b/shell/hush_test/hush-misc/source1.right
@@ -1,5 +1,2 @@
1	hush: syntax error: unterminated ${name}	1	Sourced ok
2	line2	2	Done
3	Ok1:0
4	hush: syntax error: unterminated '
5	Ok2:1


diff --git a/shell/hush_test/hush-misc/source1.tests b/shell/hush_test/hush-misc/source1.tests index c13888359..e2e75b227 100755 --- a/shell/hush_test/hush-misc/source1.tests +++ b/shell/hush_test/hush-misc/source1.tests
@@ -1,10 +1,5 @@
1	echo 'echo ${^}	1	echo "echo Sourced ok" >../sourced.sh
2	echo line2' >sourced1	2	PATH="..:$PATH"
3	. ./sourced1	3	. sourced.sh
4	echo Ok1:$?	4	rm ../sourced.sh
5		5	echo Done
6	echo "echo '" >sourced1
7	. ./sourced1
8	echo Ok2:$?
9
10	rm sourced1


diff --git a/shell/hush_test/hush-misc/source2.right b/shell/hush_test/hush-misc/source2.right index 0587bad67..ce7171c87 100644 --- a/shell/hush_test/hush-misc/source2.right +++ b/shell/hush_test/hush-misc/source2.right
@@ -1,4 +1 @@
1	0:arg0 1:arg1 2:arg2		Done: 0
2	Ok1:0
3	0:arg0 1:q 2:w
4	Ok2:0


diff --git a/shell/hush_test/hush-misc/source2.tests b/shell/hush_test/hush-misc/source2.tests index 40b6b83cd..1870cdf7e 100755 --- a/shell/hush_test/hush-misc/source2.tests +++ b/shell/hush_test/hush-misc/source2.tests
@@ -1,8 +1,3 @@
1	echo 'echo "0:$0 1:$1 2:$2"' >sourced1	1	false
2	set -- 1 2 3	2	. /dev/null
3	"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2	3	echo Done: $?
4	echo Ok1:$?
5	"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
6	echo Ok2:$?
7
8	rm sourced1


diff --git a/shell/hush_test/hush-misc/source4.right b/shell/hush_test/hush-misc/source4.right new file mode 100644 index 000000000..d4256034b --- /dev/null +++ b/shell/hush_test/hush-misc/source4.right
@@ -0,0 +1,5 @@
		1	hush: syntax error: unterminated ${name}
		2	line2
		3	Ok1:0
		4	hush: syntax error: unterminated '
		5	Ok2:1


diff --git a/shell/hush_test/hush-misc/source4.tests b/shell/hush_test/hush-misc/source4.tests new file mode 100755 index 000000000..c13888359 --- /dev/null +++ b/shell/hush_test/hush-misc/source4.tests
@@ -0,0 +1,10 @@
		1	echo 'echo ${^}
		2	echo line2' >sourced1
		3	. ./sourced1
		4	echo Ok1:$?
		5
		6	echo "echo '" >sourced1
		7	. ./sourced1
		8	echo Ok2:$?
		9
		10	rm sourced1


diff --git a/shell/hush_test/hush-misc/source5.right b/shell/hush_test/hush-misc/source5.right new file mode 100644 index 000000000..0587bad67 --- /dev/null +++ b/shell/hush_test/hush-misc/source5.right
@@ -0,0 +1,4 @@
		1	0:arg0 1:arg1 2:arg2
		2	Ok1:0
		3	0:arg0 1:q 2:w
		4	Ok2:0


diff --git a/shell/hush_test/hush-misc/source5.tests b/shell/hush_test/hush-misc/source5.tests new file mode 100755 index 000000000..40b6b83cd --- /dev/null +++ b/shell/hush_test/hush-misc/source5.tests
@@ -0,0 +1,8 @@
		1	echo 'echo "0:$0 1:$1 2:$2"' >sourced1
		2	set -- 1 2 3
		3	"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2
		4	echo Ok1:$?
		5	"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
		6	echo Ok2:$?
		7
		8	rm sourced1