From 3675c37b9b0bb4ba565b690b95b0b9c7d0ce8123 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 23 Jul 2018 16:31:21 +0200
Subject: hush: fix heredoc handling in the "cmd <<EOF ;<newline>" case

function                                             old     new   delta
parse_stream                                        2759    2787     +28

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/hush_test/hush-heredoc/heredoc9.right | 1 +
 shell/hush_test/hush-heredoc/heredoc9.tests | 9 +++++++++
 shell/hush_test/hush-heredoc/heredocA.right | 1 +
 shell/hush_test/hush-heredoc/heredocA.tests | 4 ++++
 4 files changed, 15 insertions(+)
 create mode 100644 shell/hush_test/hush-heredoc/heredoc9.right
 create mode 100755 shell/hush_test/hush-heredoc/heredoc9.tests
 create mode 100644 shell/hush_test/hush-heredoc/heredocA.right
 create mode 100755 shell/hush_test/hush-heredoc/heredocA.tests

(limited to 'shell/hush_test')

diff --git a/shell/hush_test/hush-heredoc/heredoc9.right b/shell/hush_test/hush-heredoc/heredoc9.right
new file mode 100644
index 000000000..ce0136250
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc9.right
@@ -0,0 +1 @@
+hello
diff --git a/shell/hush_test/hush-heredoc/heredoc9.tests b/shell/hush_test/hush-heredoc/heredoc9.tests
new file mode 100755
index 000000000..96c227cc1
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc9.tests
@@ -0,0 +1,9 @@
+echo hello >greeting
+cat <<EOF &&
+$(cat greeting)
+EOF
+{
+	echo $?
+	cat greeting
+} >/dev/null
+rm greeting
diff --git a/shell/hush_test/hush-heredoc/heredocA.right b/shell/hush_test/hush-heredoc/heredocA.right
new file mode 100644
index 000000000..7326d9603
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredocA.right
@@ -0,0 +1 @@
+Ok
diff --git a/shell/hush_test/hush-heredoc/heredocA.tests b/shell/hush_test/hush-heredoc/heredocA.tests
new file mode 100755
index 000000000..440aaf906
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredocA.tests
@@ -0,0 +1,4 @@
+{ cat <<EOF ;
+Ok
+EOF
+}
-- 
cgit v1.2.3