From c7a774dde4b777126de5ef9f718b503a15bf4d30 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 2 Oct 2016 18:23:14 +0200 Subject: [PATCH] sh testsuite: sync ash-misc/source* and hush-misc/source* Signed-off-by: Denys Vlasenko --- shell/ash_test/ash-misc/source5.right | 4 ++++ shell/ash_test/ash-misc/source5.tests | 8 ++++++++ shell/hush_test/hush-misc/source1.right | 7 ++----- shell/hush_test/hush-misc/source1.tests | 15 +++++---------- shell/hush_test/hush-misc/source2.right | 5 +---- shell/hush_test/hush-misc/source2.tests | 11 +++-------- shell/hush_test/hush-misc/source4.right | 5 +++++ shell/hush_test/hush-misc/source4.tests | 10 ++++++++++ shell/hush_test/hush-misc/source5.right | 4 ++++ shell/hush_test/hush-misc/source5.tests | 8 ++++++++ 10 files changed, 50 insertions(+), 27 deletions(-) create mode 100644 shell/ash_test/ash-misc/source5.right create mode 100755 shell/ash_test/ash-misc/source5.tests create mode 100644 shell/hush_test/hush-misc/source4.right create mode 100755 shell/hush_test/hush-misc/source4.tests create mode 100644 shell/hush_test/hush-misc/source5.right create mode 100755 shell/hush_test/hush-misc/source5.tests diff --git a/shell/ash_test/ash-misc/source5.right b/shell/ash_test/ash-misc/source5.right new file mode 100644 index 000000000..0587bad67 --- /dev/null +++ b/shell/ash_test/ash-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/ash_test/ash-misc/source5.tests b/shell/ash_test/ash-misc/source5.tests new file mode 100755 index 000000000..40b6b83cd --- /dev/null +++ b/shell/ash_test/ash-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 @@ -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 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 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 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 -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 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 -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 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 -- 2.25.1