From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 2 Oct 2016 15:49:46 +0000 (+0200)
Subject: sh testsuite: create hush-heredoc/* and move files around
X-Git-Tag: 1_26_0~188
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b73f8471a3694d2e6b035bb7f04e1f4df943f03;p=oweals%2Fbusybox.git

sh testsuite: create hush-heredoc/* and move files around

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

diff --git a/shell/ash_test/ash-heredoc/heredoc5.right b/shell/ash_test/ash-heredoc/heredoc5.right
new file mode 100644
index 000000000..74110e3b5
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc5.right
@@ -0,0 +1,9 @@
+exit EOF-f
+"
+echo 1
+echo Hello World
+moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+Ok
diff --git a/shell/ash_test/ash-heredoc/heredoc5.tests b/shell/ash_test/ash-heredoc/heredoc5.tests
new file mode 100755
index 000000000..e619bded1
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc5.tests
@@ -0,0 +1,12 @@
+f=1
+  cat <<- EOF-f
+		exit EOF-f
+"
+echo $f
+echo `echo Hello World`
+		moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+EOF-f
+echo Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc1.right b/shell/hush_test/hush-heredoc/heredoc1.right
new file mode 100644
index 000000000..7fc68f3e1
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc1.right
@@ -0,0 +1,5 @@
+qwe
+asd
+123
+456
+Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc1.tests b/shell/hush_test/hush-heredoc/heredoc1.tests
new file mode 100755
index 000000000..2eeb4726b
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc1.tests
@@ -0,0 +1,9 @@
+cat <<000; cat <<www; cat <<eee
+000
+qwe
+asd
+www
+123
+456
+eee
+echo Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc2.right b/shell/hush_test/hush-heredoc/heredoc2.right
new file mode 100644
index 000000000..a486f1ac4
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc2.right
@@ -0,0 +1,2 @@
+bar
+bar
diff --git a/shell/hush_test/hush-heredoc/heredoc2.tests b/shell/hush_test/hush-heredoc/heredoc2.tests
new file mode 100755
index 000000000..6d9ccb6cc
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc2.tests
@@ -0,0 +1,7 @@
+foo () {
+cat <<EOF && { echo "$1" ; }
+$1
+EOF
+}
+
+foo "bar"
diff --git a/shell/hush_test/hush-heredoc/heredoc3.right b/shell/hush_test/hush-heredoc/heredoc3.right
new file mode 100644
index 000000000..6ed517f74
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc3.right
@@ -0,0 +1,9 @@
+exit EOF-f
+"
+echo $f
+echo `echo Hello World`
+moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc3.tests b/shell/hush_test/hush-heredoc/heredoc3.tests
new file mode 100755
index 000000000..938577a89
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc3.tests
@@ -0,0 +1,12 @@
+f=1
+  cat <<- EOF-f""
+		exit EOF-f
+"
+echo $f
+echo `echo Hello World`
+		moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+EOF-f
+echo Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc4.right b/shell/hush_test/hush-heredoc/heredoc4.right
new file mode 100644
index 000000000..371b092e2
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc4.right
@@ -0,0 +1 @@
+'$'
diff --git a/shell/hush_test/hush-heredoc/heredoc4.tests b/shell/hush_test/hush-heredoc/heredoc4.tests
new file mode 100755
index 000000000..642ddb324
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc4.tests
@@ -0,0 +1,3 @@
+cat <<EOF
+'$'
+EOF
diff --git a/shell/hush_test/hush-heredoc/heredoc5.right b/shell/hush_test/hush-heredoc/heredoc5.right
new file mode 100644
index 000000000..74110e3b5
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc5.right
@@ -0,0 +1,9 @@
+exit EOF-f
+"
+echo 1
+echo Hello World
+moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc5.tests b/shell/hush_test/hush-heredoc/heredoc5.tests
new file mode 100755
index 000000000..e619bded1
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc5.tests
@@ -0,0 +1,12 @@
+f=1
+  cat <<- EOF-f
+		exit EOF-f
+"
+echo $f
+echo `echo Hello World`
+		moo	 
+ EOF-f
+EOF-f   f
+EOF-f 
+EOF-f
+echo Ok
diff --git a/shell/hush_test/hush-heredoc/heredoc_backslash1.right b/shell/hush_test/hush-heredoc/heredoc_backslash1.right
new file mode 100644
index 000000000..6a6114821
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_backslash1.right
@@ -0,0 +1,43 @@
+Quoted heredoc:
+a\
+	b
+a\\
+	b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted heredoc:
+a	b
+a\
+	b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+	-qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF2
+
+Quoted -heredoc:
+a\
+b
+a\\
+b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+
+Unquoted -heredoc:
+a	b
+a\
+b
+ 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+-qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
+ 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
+cEOF4
+
+Done: 0
diff --git a/shell/hush_test/hush-heredoc/heredoc_backslash1.tests b/shell/hush_test/hush-heredoc/heredoc_backslash1.tests
new file mode 100755
index 000000000..501af5490
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_backslash1.tests
@@ -0,0 +1,70 @@
+# Test for correct handling of backslashes.
+# Note that some lines in each heredoc start with a tab.
+
+a=qwerty
+
+echo Quoted heredoc:
+cat <<"EOF1"
+a\
+	b
+a\\
+	b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+EOF1
+echo
+
+echo Unquoted heredoc:
+cat <<EOF2
+a\
+	b
+a\\
+	b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF2
+EOF2
+echo
+
+echo Quoted -heredoc:
+cat <<-"EOF3"
+a\
+	b
+a\\
+	b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
+c\
+	EOF3
+# In -heredoc case the marker is detected even if it is indented.
+echo
+
+echo Unquoted -heredoc:
+cat <<-EOF4
+a\
+	b
+a\\
+	b
+ 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
+ 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
+ 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
+c\
+EOF4
+	EOF4
+# The marker is not detected if preceding line ends in backslash.
+# TODO: marker should be detected even if it is split by line continuation:
+# EOF\
+# 4
+# but currently hush doesn't do it. (Tab before "4" is not allowed, though.)
+echo
+
+echo "Done: $?"
diff --git a/shell/hush_test/hush-heredoc/heredoc_huge.right b/shell/hush_test/hush-heredoc/heredoc_huge.right
new file mode 100644
index 000000000..11740f674
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_huge.right
@@ -0,0 +1,3 @@
+546ed3f5c81c780d3ab86ada14824237  -
+546ed3f5c81c780d3ab86ada14824237  -
+End
diff --git a/shell/hush_test/hush-heredoc/heredoc_huge.tests b/shell/hush_test/hush-heredoc/heredoc_huge.tests
new file mode 100755
index 000000000..c2ec2817b
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_huge.tests
@@ -0,0 +1,9 @@
+# This creates 120k heredoc
+echo 'cat <<HERE | md5sum' >"$0.tmp"
+yes "123456789 123456789 123456789 123456789" | head -3000 >>"$0.tmp"
+echo 'HERE' >>"$0.tmp"
+
+yes "123456789 123456789 123456789 123456789" | head -3000 | md5sum
+. "$0.tmp"
+rm "$0.tmp"
+echo End
diff --git a/shell/hush_test/hush-misc/heredoc1.right b/shell/hush_test/hush-misc/heredoc1.right
deleted file mode 100644
index 7fc68f3e1..000000000
--- a/shell/hush_test/hush-misc/heredoc1.right
+++ /dev/null
@@ -1,5 +0,0 @@
-qwe
-asd
-123
-456
-Ok
diff --git a/shell/hush_test/hush-misc/heredoc1.tests b/shell/hush_test/hush-misc/heredoc1.tests
deleted file mode 100755
index 2eeb4726b..000000000
--- a/shell/hush_test/hush-misc/heredoc1.tests
+++ /dev/null
@@ -1,9 +0,0 @@
-cat <<000; cat <<www; cat <<eee
-000
-qwe
-asd
-www
-123
-456
-eee
-echo Ok
diff --git a/shell/hush_test/hush-misc/heredoc2.right b/shell/hush_test/hush-misc/heredoc2.right
deleted file mode 100644
index 74110e3b5..000000000
--- a/shell/hush_test/hush-misc/heredoc2.right
+++ /dev/null
@@ -1,9 +0,0 @@
-exit EOF-f
-"
-echo 1
-echo Hello World
-moo	 
- EOF-f
-EOF-f   f
-EOF-f 
-Ok
diff --git a/shell/hush_test/hush-misc/heredoc2.tests b/shell/hush_test/hush-misc/heredoc2.tests
deleted file mode 100755
index e619bded1..000000000
--- a/shell/hush_test/hush-misc/heredoc2.tests
+++ /dev/null
@@ -1,12 +0,0 @@
-f=1
-  cat <<- EOF-f
-		exit EOF-f
-"
-echo $f
-echo `echo Hello World`
-		moo	 
- EOF-f
-EOF-f   f
-EOF-f 
-EOF-f
-echo Ok
diff --git a/shell/hush_test/hush-misc/heredoc3.right b/shell/hush_test/hush-misc/heredoc3.right
deleted file mode 100644
index 6ed517f74..000000000
--- a/shell/hush_test/hush-misc/heredoc3.right
+++ /dev/null
@@ -1,9 +0,0 @@
-exit EOF-f
-"
-echo $f
-echo `echo Hello World`
-moo	 
- EOF-f
-EOF-f   f
-EOF-f 
-Ok
diff --git a/shell/hush_test/hush-misc/heredoc3.tests b/shell/hush_test/hush-misc/heredoc3.tests
deleted file mode 100755
index 938577a89..000000000
--- a/shell/hush_test/hush-misc/heredoc3.tests
+++ /dev/null
@@ -1,12 +0,0 @@
-f=1
-  cat <<- EOF-f""
-		exit EOF-f
-"
-echo $f
-echo `echo Hello World`
-		moo	 
- EOF-f
-EOF-f   f
-EOF-f 
-EOF-f
-echo Ok
diff --git a/shell/hush_test/hush-misc/heredoc4.right b/shell/hush_test/hush-misc/heredoc4.right
deleted file mode 100644
index 371b092e2..000000000
--- a/shell/hush_test/hush-misc/heredoc4.right
+++ /dev/null
@@ -1 +0,0 @@
-'$'
diff --git a/shell/hush_test/hush-misc/heredoc4.tests b/shell/hush_test/hush-misc/heredoc4.tests
deleted file mode 100755
index 642ddb324..000000000
--- a/shell/hush_test/hush-misc/heredoc4.tests
+++ /dev/null
@@ -1,3 +0,0 @@
-cat <<EOF
-'$'
-EOF
diff --git a/shell/hush_test/hush-misc/heredoc_backslash1.right b/shell/hush_test/hush-misc/heredoc_backslash1.right
deleted file mode 100644
index 6a6114821..000000000
--- a/shell/hush_test/hush-misc/heredoc_backslash1.right
+++ /dev/null
@@ -1,43 +0,0 @@
-Quoted heredoc:
-a\
-	b
-a\\
-	b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
-	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
-c\
-
-Unquoted heredoc:
-a	b
-a\
-	b
- 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
-	-qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
- 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
- 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
-cEOF2
-
-Quoted -heredoc:
-a\
-b
-a\\
-b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
--$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
-c\
-
-Unquoted -heredoc:
-a	b
-a\
-b
- 123456 -qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
--qwerty-\t-\-\"-\'-`-\--\z-\*-\?-
- 123456 v-$a-\t-\-\"-\x-`-\--\z-\*-\?-
- 123456 v-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-
-cEOF4
-
-Done: 0
diff --git a/shell/hush_test/hush-misc/heredoc_backslash1.tests b/shell/hush_test/hush-misc/heredoc_backslash1.tests
deleted file mode 100755
index 501af5490..000000000
--- a/shell/hush_test/hush-misc/heredoc_backslash1.tests
+++ /dev/null
@@ -1,70 +0,0 @@
-# Test for correct handling of backslashes.
-# Note that some lines in each heredoc start with a tab.
-
-a=qwerty
-
-echo Quoted heredoc:
-cat <<"EOF1"
-a\
-	b
-a\\
-	b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
-	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
-c\
-EOF1
-echo
-
-echo Unquoted heredoc:
-cat <<EOF2
-a\
-	b
-a\\
-	b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
-	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
-c\
-EOF2
-EOF2
-echo
-
-echo Quoted -heredoc:
-cat <<-"EOF3"
-a\
-	b
-a\\
-	b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
-	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-')
-c\
-	EOF3
-# In -heredoc case the marker is detected even if it is indented.
-echo
-
-echo Unquoted -heredoc:
-cat <<-EOF4
-a\
-	b
-a\\
-	b
- 123456 -$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
-	-$a-\t-\\-\"-\'-\`-\--\z-\*-\?-
- 123456 `echo  v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-'`
- 123456 $(echo v'-$a-\t-\\-\"-\x-\`-\--\z-\*-\?-')
-c\
-EOF4
-	EOF4
-# The marker is not detected if preceding line ends in backslash.
-# TODO: marker should be detected even if it is split by line continuation:
-# EOF\
-# 4
-# but currently hush doesn't do it. (Tab before "4" is not allowed, though.)
-echo
-
-echo "Done: $?"
diff --git a/shell/hush_test/hush-misc/heredoc_huge.right b/shell/hush_test/hush-misc/heredoc_huge.right
deleted file mode 100644
index 11740f674..000000000
--- a/shell/hush_test/hush-misc/heredoc_huge.right
+++ /dev/null
@@ -1,3 +0,0 @@
-546ed3f5c81c780d3ab86ada14824237  -
-546ed3f5c81c780d3ab86ada14824237  -
-End
diff --git a/shell/hush_test/hush-misc/heredoc_huge.tests b/shell/hush_test/hush-misc/heredoc_huge.tests
deleted file mode 100755
index c2ec2817b..000000000
--- a/shell/hush_test/hush-misc/heredoc_huge.tests
+++ /dev/null
@@ -1,9 +0,0 @@
-# This creates 120k heredoc
-echo 'cat <<HERE | md5sum' >"$0.tmp"
-yes "123456789 123456789 123456789 123456789" | head -3000 >>"$0.tmp"
-echo 'HERE' >>"$0.tmp"
-
-yes "123456789 123456789 123456789 123456789" | head -3000 | md5sum
-. "$0.tmp"
-rm "$0.tmp"
-echo End