sh testsuite: sync ash-misc/source* and hush-misc/source*

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

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 d425603..0ab7c54 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}
-line2
-Ok1:0
-hush: syntax error: unterminated '
-Ok2:1
+Sourced ok
+Done
diff --git a/shell/hush_test/hush-misc/source1.tests b/shell/hush_test/hush-misc/source1.tests
index c138883..e2e75b2 100755
--- a/shell/hush_test/hush-misc/source1.tests
+++ b/shell/hush_test/hush-misc/source1.tests
@@ -1,10 +1,5 @@
-echo 'echo ${^}
-echo line2' >sourced1
-. ./sourced1
-echo Ok1:$?
-
-echo "echo '" >sourced1
-. ./sourced1
-echo Ok2:$?
-
-rm sourced1
+echo "echo Sourced ok" >../sourced.sh
+PATH="..:$PATH"
+. sourced.sh
+rm ../sourced.sh
+echo Done
diff --git a/shell/hush_test/hush-misc/source2.right b/shell/hush_test/hush-misc/source2.right
index 0587bad..ce7171c 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
-Ok1:0
-0:arg0 1:q 2:w
-Ok2:0
+Done: 0
diff --git a/shell/hush_test/hush-misc/source2.tests b/shell/hush_test/hush-misc/source2.tests
index 40b6b83..1870cdf 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
-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
+false
+. /dev/null
+echo Done: $?
diff --git a/shell/hush_test/hush-misc/source4.right b/shell/hush_test/hush-misc/source4.right
new file mode 100644
index 0000000..d425603
--- /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 0000000..c138883
--- /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 0000000..0587bad
--- /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 0000000..40b6b83
--- /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