hush: fix var_backslash1.tests

function                                             old     new   delta
o_addqblock                                            -     131    +131
append_str_maybe_ifs_split                            53     100     +47
expand_one_var                                      1872    1897     +25
encode_then_expand_vararg                            380     399     +19
sig_unblock                                           41      43      +2
sig_block                                             41      40      -1
sigprocmask_allsigs                                   33      31      -2
expand_vars_to_list                                 1080    1077      -3
wait_for_child_or_signal                             202     193      -9
o_addQstr                                            175      42    -133
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 4/5 up/down: 224/-148)           Total: 76 bytes

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

2 files changed, 19 insertions, 0 deletions

diff --git a/shell/ash_test/ash-vars/var_backslash1.right b/shell/ash_test/ash-vars/var_backslash1.right
index f384da1f5..3f2c21289 100644
--- a/shell/ash_test/ash-vars/var_backslash1.right
+++ b/shell/ash_test/ash-vars/var_backslash1.right
@@ -14,6 +14,15 @@ ${a##\\"$c"} removes \*:        |bc| - matches \, then *
 ${a##$b} removes \:             |*bc| - matches \
 ${a##"$b"} removes \:           |*bc| - matches \
 
+Single quote tests:
+${a##?'*'} removes \*:          |bc| - matches one char, then *
+${a##'\'*} removes everything:  || - matches \, then all
+${a##'\'\*} removes \*:         |bc| - matches \, then *
+${a##'\*'} removes \*:          |bc| - matches \, then *
+${a##'\'$c} removes everything: || - matches \, then all
+${a##'\'\$c} removes nothing:   |\*bc| - matches \, but then second char is not $
+${a##'\'"$c"} removes \*:       |bc| - matches \, then *
+
 ${a##"$b"?} removes \*:         |bc| - matches \, then one char
 ${a##"$b"*} removes everything: || - matches \, then all
 ${a##"$b""?"} removes nothing:  |\*bc| - second char is not ?
diff --git a/shell/ash_test/ash-vars/var_backslash1.tests b/shell/ash_test/ash-vars/var_backslash1.tests
index 7eea3cc19..015a6107b 100755
--- a/shell/ash_test/ash-vars/var_backslash1.tests
+++ b/shell/ash_test/ash-vars/var_backslash1.tests
@@ -17,6 +17,16 @@ echo '${a##\\"$c"} removes \*:        '"|${a##\\"$c"}|"' - matches \, then *'
 echo '${a##$b} removes \:             '"|${a##$b}|"' - matches \'
 echo '${a##"$b"} removes \:           '"|${a##"$b"}|"' - matches \'
 echo
+sq="'"
+echo 'Single quote tests:'
+echo '${a##?'$sq'*'$sq'} removes \*:          '"|${a##?'*'}|"' - matches one char, then *'
+echo '${a##'$sq'\'$sq'*} removes everything:  '"|${a##'\'*}|"' - matches \, then all'
+echo '${a##'$sq'\'$sq'\*} removes \*:         '"|${a##'\'\*}|"' - matches \, then *'
+echo '${a##'$sq'\*'$sq'} removes \*:          '"|${a##'\*'}|"' - matches \, then *'
+echo '${a##'$sq'\'$sq'$c} removes everything: '"|${a##'\'$c}|"' - matches \, then all'
+echo '${a##'$sq'\'$sq'\$c} removes nothing:   '"|${a##'\'\$c}|"' - matches \, but then second char is not $'
+echo '${a##'$sq'\'$sq'"$c"} removes \*:       '"|${a##'\'"$c"}|"' - matches \, then *'
+echo
 ## In bash, this isn't working as expected
 #echo '${a##$b?} removes \*:           '"|${a##$b?}|"' - matches \, then one char'   # bash prints |\*bc|
 #echo '${a##$b*} removes everything:   '"|${a##$b*}|"' - matches \, then all'        # bash prints |\*bc|