commit bash-20110513 snapshot

tests/cond-regexp.sub

@@ -40,3 +40,10 @@ v="one two buckle my shoe"
 [[ ${v} =~ (one two) ]] && echo matches 8
 
 [[ ${v} =~ one\ two ]] && echo matches 9
+
+# problems in pre-patched bash-4.2
+[[ "hello
world" =~ llo
 ]] && echo match control-a 1
+[[ "hello
world" =~ 
world ]] && echo match control-a 2
+[[ "hello
world" =~ 
world$ ]] && echo match control-a 3
+[[ "hello
world" =~ 
 ]] && echo match control-a 4
+[[ "hello
world" =~ o
world$ ]] && echo match control-a 5

tests/cond.right

@@ -59,3 +59,8 @@ rematch 1
 matches 7
 matches 8
 matches 9
+match control-a 1
+match control-a 2
+match control-a 3
+match control-a 4
+match control-a 5

tests/exp.right

@@ -1,9 +1,9 @@
 argv[1] = <^A>
 argv[1] = <^A>
-argv[1] = <^B>
-argv[1] = <^B>
+argv[1] = <^?>
+argv[1] = <^?>
 argv[1] = <^A>
-argv[1] = <^B>
+argv[1] = <^?>
 argv[1] = <abcdefgh>
 argv[1] = <abcdefgh>
 argv[1] = <abcdefgh>
@@ -25,11 +25,11 @@ argv[1] = <abc>
 argv[1] = <abcdef>
 argv[1] = <abcdef>
 argv[1] = <^A>
-argv[1] = <^B>
+argv[1] = <^?>
 argv[1] = <^A>
-argv[1] = <^B>
+argv[1] = <^?>
 argv[1] = <^A>
-argv[1] = <^B>
+argv[1] = <^?>
 argv[1] = <>
 argv[1] = <>
 argv[1] = <>
@@ -42,13 +42,13 @@ argv[1] = <\\>
 argv[1] = <a>
 argv[2] = <b>
 argv[1] = <^A>
-argv[2] = <^B>
+argv[2] = <^?>
 argv[1] = <**>
 argv[1] = <\.\./*/>
-argv[1] = <^A^B^A^B>
+argv[1] = <^A^?^A^?>
 argv[1] = <^A^A>
-argv[1] = <^A^B>
-argv[1] = <^A^A^B>
+argv[1] = <^A^?>
+argv[1] = <^A^A^?>
 argv[1] = <  abc>
 argv[2] = <def>
 argv[3] = <ghi>
@@ -178,3 +178,14 @@ hello
 
 hello
 eo
+argv[1] = <a>
+argv[1] = <a>
+argv[1] = <^?>
+argv[1] = <^?b>
+argv[1] = <b^?>
+argv[1] = <c>
+argv[1] = <c>
+argv[1] = <c>
+argv[1] = <c>
+argv[1] = <c>
+argv[1] = <c>

tests/exp.tests

@@ -22,14 +22,14 @@ expect "<^A>"
 recho `echo '
'`
 expect "<^A>"
 recho `echo "
"`
-expect "<^B>"
-recho `echo ''`
-expect "<^B>"
-recho `echo ""`
+expect "<^?>"
+recho `echo ''`
+expect "<^?>"
+recho `echo ""`
 expect "<^A>"
 recho `echo 
`
-expect "<^B>"
-recho `echo `
+expect "<^?>"
+recho `echo `
 
 # Test null strings without variable expansion
 expect "<abcdefgh>"
@@ -89,16 +89,16 @@ unset xxx yyy
 # Test the unquoted special quoting characters
 expect "<^A>"
 recho 

-expect "<^B>"
-recho 
+expect "<^?>"
+recho 
 expect "<^A>"
 recho "
"
-expect "<^B>"
-recho ""
+expect "<^?>"
+recho ""
 expect "<^A>"
 recho '
'
-expect "<^B>"
-recho ''
+expect "<^?>"
+recho ''
 
 # Test expansion of a variable that is unset
 expect nothing
@@ -139,9 +139,9 @@ expect '<a> <b>'
 FOO=`echo 'a b' | tr ' ' '\012'`
 recho $FOO
 
-# This should give argv[1] = ^A argv[2] = ^B
-expect '<^A> <^B>'
-FOO=`echo '
 ' | tr ' ' '\012'`
+# This should give argv[1] = ^A argv[2] = ^?
+expect '<^A> <^?>'
+FOO=`echo '
 ' | tr ' ' '\012'`
 recho $FOO
 
 # Test quoted and unquoted globbing characters
@@ -153,14 +153,14 @@ recho "\.\./*/"
 
 # Test patterns that come up when the shell quotes funny character
 # combinations
-expect '<^A^B^A^B>'
-recho '

'
+expect '<^A^?^A^?>'
+recho '

'
 expect '<^A^A>'
 recho '

'
-expect '<^A^B>'
-recho '
'
-expect '<^A^A^B>'
-recho '

'
+expect '<^A^?>'
+recho '
'
+expect '<^A^A^?>'
+recho '

'
 
 # More tests of "$@"
 set abc def ghi jkl
@@ -388,3 +388,5 @@ ${THIS_SH} ./exp3.sub
 ${THIS_SH} ./exp4.sub
 
 ${THIS_SH} ./exp5.sub
+
+${THIS_SH} ./exp6.sub

tests/exp6.sub

@@ -0,0 +1,16 @@
+recho """"a
+recho a""""
+
+recho """"
+
+recho """"b
+recho b""""
+
+recho """"""c
+recho c""""""
+
+recho """"""c""""
+recho """"c""""""
+
+recho """"""""c
+recho c""""""""