From e8d6041f69f8bfde92ebdd09410bde3ae88978ff Mon Sep 17 00:00:00 2001
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
Date: Sat, 7 Nov 2015 18:05:43 +0000
Subject: 37074: extend previous fix to over whitespace at end

---
 Test/D04parameter.ztst | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'Test/D04parameter.ztst')

diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index 59c14a408..694b613c5 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -1751,26 +1751,26 @@
  }
  foo=bar
  foo2="bar bar"
- do_test ${:- foo}
- do_test ${:- foo bar}
- do_test ${:- $foo}
- do_test ${:- $foo2}
- do_test x${:- foo}
- do_test x${:- foo bar}
- do_test x${:- $foo}
- do_test x${:- $foo2}
- do_test x${foo:+ $foo}
+ do_test ${:- foo }
+ do_test ${:- foo bar }
+ do_test ${:- $foo }
+ do_test ${:- $foo2 }
+ do_test x${:- foo }y
+ do_test x${:- foo bar }y
+ do_test x${:- $foo }y
+ do_test x${:- $foo2 }y
+ do_test x${foo:+ $foo }y
  )
 0:We Love SH_WORD_SPLIT Day celebrated with space at start of internal subst
 >1: foo
 >2: foo bar
 >1: bar
 >2: bar bar
->2: x foo
->3: x foo bar
->2: x bar
->3: x bar bar
->2: x bar
+>3: x foo y
+>4: x foo bar y
+>3: x bar y
+>4: x bar bar y
+>3: x bar y
 
  (unsetopt shwordsplit # default, for clarity
  do_test() {
@@ -1778,23 +1778,23 @@
  }
  foo=bar
  foo2="bar bar"
- do_test ${:- foo}
- do_test ${:- foo bar}
- do_test ${:- $foo}
- do_test ${:- $foo2}
- do_test x${:- foo}
- do_test x${:- foo bar}
- do_test x${:- $foo}
- do_test x${:- $foo2}
- do_test x${foo:+ $foo}
+ do_test ${:- foo }
+ do_test ${:- foo bar }
+ do_test ${:- $foo }
+ do_test ${:- $foo2 }
+ do_test x${:- foo }y
+ do_test x${:- foo bar }y
+ do_test x${:- $foo }y
+ do_test x${:- $foo2 }y
+ do_test x${foo:+ $foo }y
  )
 0:We Love NO_SH_WORD_SPLIT Even More Day celebrated as sanity check
->1:  foo
->1:  foo bar
->1:  bar
->1:  bar bar
->1: x foo
->1: x foo bar
->1: x bar
->1: x bar bar
->1: x bar
+>1:  foo 
+>1:  foo bar 
+>1:  bar 
+>1:  bar bar 
+>1: x foo y
+>1: x foo bar y
+>1: x bar y
+>1: x bar bar y
+>1: x bar y
-- 
cgit 1.4.1