diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6826ec4bf65..5fca9d2243b 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-04-08 Pierre Muller + + * gdb.base/printcmds.exp (test_artificial_arrays): Disable + Ctrl-V use for mingw hosts. + 2014-04-07 Siva Chandra Reddy * gdb.python/py-value.c: Improve test case. diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp index a4b5b475834..c667aa9a0f6 100644 --- a/gdb/testsuite/gdb.base/printcmds.exp +++ b/gdb/testsuite/gdb.base/printcmds.exp @@ -622,8 +622,16 @@ proc test_print_typedef_arrays {} { proc test_artificial_arrays {} { # Send \026@ instead of just @ in case the kill character is @. - gdb_test_escape_braces "p int1dim\[0\]\026@2" " = {0, 1}" {p int1dim[0]@2} - gdb_test_escape_braces "p int1dim\[0\]\026@2\026@3" \ + # \026 (ctrl-v) is to escape the next character (@), but it is + # not only unnecessary to do so on MingW hosts, but also harmful + # for the test because that character isn't recognized as an + # escape character. + set ctrlv "\026" + if [ishost *-*-mingw*] { + set ctrlv "" + } + gdb_test_escape_braces "p int1dim\[0\]${ctrlv}@2" " = {0, 1}" {p int1dim[0]@2} + gdb_test_escape_braces "p int1dim\[0\]${ctrlv}@2${ctrlv}@3" \ "({{0, 1}, {2, 3}, {4, 5}}|\[Cc\]annot.*)" \ {p int1dim[0]@2@3} gdb_test_escape_braces {p/x (short [])0x12345678} \