ash: fix var_leak testcase

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

diff --git a/shell/ash_test/ash-vars/var_leak.right b/shell/ash_test/ash-vars/var_leak.right
index 45c5458dd8250b1ef0e88785331a233e92908a02..be78112c8e2a190b2249e794c41a2cffcfa9873a 100644 (file)
--- a/shell/ash_test/ash-vars/var_leak.right
+++ b/shell/ash_test/ash-vars/var_leak.right
@@ -1,2 +1,3 @@
 should be empty: ''
-should be empty: ''
+should be not empty: 'val2'
+should be not empty: 'val3'

diff --git a/shell/ash_test/ash-vars/var_leak.tests b/shell/ash_test/ash-vars/var_leak.tests
index 1b1123fb7bba5693f033a79d647c8764ed677eee..032059295e2eb7e3186a9461b911f485c40f128d 100755 (executable)
--- a/shell/ash_test/ash-vars/var_leak.tests
+++ b/shell/ash_test/ash-vars/var_leak.tests
@@ -1,9 +1,18 @@
-# This currently fails with CONFIG_FEATURE_SH_NOFORK=y
+# true is a regular builtin, varibale should not leak out of it
+# this currently fails with CONFIG_FEATURE_SH_NOFORK=y
 VAR=''
-VAR=qwe true
+VAR=val1 true
 echo "should be empty: '$VAR'"
 
-# This fails (always)
+# ash follows the "special builtin leaks variables" rule here:
+# exec is a special builtin. (bash does not do it)
 VAR=''
-VAR=qwe exec 2>&1
-echo "should be empty: '$VAR'"
+VAR=val2 exec 2>&1
+echo "should be not empty: '$VAR'"
+
+# ash follows the "function call is a special builtin" rule here
+# (bash does not do it)
+f() { true; }
+VAR=''
+VAR=val3 f
+echo "should be not empty: '$VAR'"