From 5b3d2eb327ce7e1c55c6c94bc70782f733d59990 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 31 Jul 2017 18:02:28 +0200
Subject: hush: fix "true | func_with_return" not allowing return.

function                                             old     new   delta
pseudo_exec_argv                                     305     312      +7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/hush_test/hush-misc/func6.right        |  2 --
 shell/hush_test/hush-misc/func6.tests        | 11 -----------
 shell/hush_test/hush-misc/func_return1.right |  2 ++
 shell/hush_test/hush-misc/func_return1.tests | 11 +++++++++++
 shell/hush_test/hush-misc/func_return2.right |  2 ++
 shell/hush_test/hush-misc/func_return2.tests |  6 ++++++
 6 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 shell/hush_test/hush-misc/func6.right
 delete mode 100755 shell/hush_test/hush-misc/func6.tests
 create mode 100644 shell/hush_test/hush-misc/func_return1.right
 create mode 100755 shell/hush_test/hush-misc/func_return1.tests
 create mode 100644 shell/hush_test/hush-misc/func_return2.right
 create mode 100755 shell/hush_test/hush-misc/func_return2.tests

(limited to 'shell/hush_test')

diff --git a/shell/hush_test/hush-misc/func6.right b/shell/hush_test/hush-misc/func6.right
deleted file mode 100644
index 0ebd8e5a3..000000000
--- a/shell/hush_test/hush-misc/func6.right
+++ /dev/null
@@ -1,2 +0,0 @@
-Two:2
-Two:2
diff --git a/shell/hush_test/hush-misc/func6.tests b/shell/hush_test/hush-misc/func6.tests
deleted file mode 100755
index 029c3e85e..000000000
--- a/shell/hush_test/hush-misc/func6.tests
+++ /dev/null
@@ -1,11 +0,0 @@
-f1() {
-	while return 2; do :; done
-}
-f1
-echo Two:$?
-
-f2() {
-	while :; do return 2; done
-}
-f2
-echo Two:$?
diff --git a/shell/hush_test/hush-misc/func_return1.right b/shell/hush_test/hush-misc/func_return1.right
new file mode 100644
index 000000000..0ebd8e5a3
--- /dev/null
+++ b/shell/hush_test/hush-misc/func_return1.right
@@ -0,0 +1,2 @@
+Two:2
+Two:2
diff --git a/shell/hush_test/hush-misc/func_return1.tests b/shell/hush_test/hush-misc/func_return1.tests
new file mode 100755
index 000000000..029c3e85e
--- /dev/null
+++ b/shell/hush_test/hush-misc/func_return1.tests
@@ -0,0 +1,11 @@
+f1() {
+	while return 2; do :; done
+}
+f1
+echo Two:$?
+
+f2() {
+	while :; do return 2; done
+}
+f2
+echo Two:$?
diff --git a/shell/hush_test/hush-misc/func_return2.right b/shell/hush_test/hush-misc/func_return2.right
new file mode 100644
index 000000000..0ebd8e5a3
--- /dev/null
+++ b/shell/hush_test/hush-misc/func_return2.right
@@ -0,0 +1,2 @@
+Two:2
+Two:2
diff --git a/shell/hush_test/hush-misc/func_return2.tests b/shell/hush_test/hush-misc/func_return2.tests
new file mode 100755
index 000000000..a049dd180
--- /dev/null
+++ b/shell/hush_test/hush-misc/func_return2.tests
@@ -0,0 +1,6 @@
+f1() { return 2; }
+f1
+echo Two:$?
+false
+true | f1
+echo Two:$?
-- 
cgit v1.2.3