From 82dfec3e4e6d2b8354d901a525f9acff35369512 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 16 Jun 2008 12:47:11 +0000
Subject: hush: fix hush-bugs/glob_and_vars.tests testcase:  globbing is now
 done _after_ variable/`cmd` substitution

function                                             old     new   delta
expand_strvec_to_strvec                                7     353    +346
expand_variables                                    1348    1383     +35
add_string_to_strings                                  -      28     +28
globhack                                             114       -    -114
done_word                                            778     579    -199
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/1 up/down: 409/-313)           Total: 96 bytes
---
 shell/hush_test/hush-bugs/empty_for.right     | 1 +
 shell/hush_test/hush-bugs/empty_for.tests     | 3 +++
 shell/hush_test/hush-bugs/glob_and_vars.right | 1 -
 shell/hush_test/hush-bugs/glob_and_vars.tests | 2 +-
 shell/hush_test/hush-vars/glob_and_vars.right | 1 +
 shell/hush_test/hush-vars/glob_and_vars.tests | 2 ++
 6 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 shell/hush_test/hush-bugs/empty_for.right
 create mode 100755 shell/hush_test/hush-bugs/empty_for.tests
 delete mode 100644 shell/hush_test/hush-bugs/glob_and_vars.right
 create mode 100644 shell/hush_test/hush-vars/glob_and_vars.right
 create mode 100755 shell/hush_test/hush-vars/glob_and_vars.tests

(limited to 'shell/hush_test')

diff --git a/shell/hush_test/hush-bugs/empty_for.right b/shell/hush_test/hush-bugs/empty_for.right
new file mode 100644
index 000000000..290d39b7e
--- /dev/null
+++ b/shell/hush_test/hush-bugs/empty_for.right
@@ -0,0 +1 @@
+OK: 0
diff --git a/shell/hush_test/hush-bugs/empty_for.tests b/shell/hush_test/hush-bugs/empty_for.tests
new file mode 100755
index 000000000..0cb52e849
--- /dev/null
+++ b/shell/hush_test/hush-bugs/empty_for.tests
@@ -0,0 +1,3 @@
+false
+for a in; do echo "HELLO"; done
+echo OK: $?
diff --git a/shell/hush_test/hush-bugs/glob_and_vars.right b/shell/hush_test/hush-bugs/glob_and_vars.right
deleted file mode 100644
index 3ac7ec5ff..000000000
--- a/shell/hush_test/hush-bugs/glob_and_vars.right
+++ /dev/null
@@ -1 +0,0 @@
-./glob_and_vars.right ./glob_and_vars.tests
diff --git a/shell/hush_test/hush-bugs/glob_and_vars.tests b/shell/hush_test/hush-bugs/glob_and_vars.tests
index c8e0c067d..482cf9d8a 100755
--- a/shell/hush_test/hush-bugs/glob_and_vars.tests
+++ b/shell/hush_test/hush-bugs/glob_and_vars.tests
@@ -1,2 +1,2 @@
 v=.
-echo $v/glob_and_vars.*
+echo $v/glob_and_vars.[tr]*
diff --git a/shell/hush_test/hush-vars/glob_and_vars.right b/shell/hush_test/hush-vars/glob_and_vars.right
new file mode 100644
index 000000000..3ac7ec5ff
--- /dev/null
+++ b/shell/hush_test/hush-vars/glob_and_vars.right
@@ -0,0 +1 @@
+./glob_and_vars.right ./glob_and_vars.tests
diff --git a/shell/hush_test/hush-vars/glob_and_vars.tests b/shell/hush_test/hush-vars/glob_and_vars.tests
new file mode 100755
index 000000000..482cf9d8a
--- /dev/null
+++ b/shell/hush_test/hush-vars/glob_and_vars.tests
@@ -0,0 +1,2 @@
+v=.
+echo $v/glob_and_vars.[tr]*
-- 
cgit v1.2.3