diff options
author | Pierre Muller <muller@sourceware.org> | 2011-05-20 14:37:20 +0000 |
---|---|---|
committer | Pierre Muller <muller@sourceware.org> | 2011-05-20 14:37:20 +0000 |
commit | eec52c44580c6571592a0a4e96dba81a32efebb3 (patch) | |
tree | 38850d416a2ecd05018feb46469afd341872e8ae | |
parent | 4a73203297f58dc69d033355f166defe8950ea1c (diff) | |
download | binutils-eec52c44580c6571592a0a4e96dba81a32efebb3.zip binutils-eec52c44580c6571592a0a4e96dba81a32efebb3.tar.gz binutils-eec52c44580c6571592a0a4e96dba81a32efebb3.tar.bz2 |
* lib/gdb.exp (gdb_test_list_exact): Suggest use of double
quote pattern to avoid problems with Cygwin/mingw expect versions.
* gdb.base/default.exp (show convenience): Use double
quote pattern for regular expressions.
-rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/default.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f1e6eea..dd94037 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-05-20 Pierre Muller <muller@ics.u-strasbg.fr> + + * lib/gdb.exp (gdb_test_list_exact): Suggest use of double + quote pattern to avoid problems with Cygwin/mingw expect versions. + * gdb.base/default.exp (show convenience): Use double + quote pattern for regular expressions. + 2011-05-20 Jan Kratochvil <jan.kratochvil@redhat.com> Fix -readnow for -gdwarf-4 unused type units. diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index d58c519..44dd711 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -601,8 +601,8 @@ gdb_test "show confirm" "Whether to confirm potentially dangerous operations is # This is tricker as there are multiple internal convenience vars and we # can't assume any particular order. gdb_test_list_exact "show convenience" "show convenience" \ - {[^\r\n]+[\r\n]+} \ - {[^\r\n]+} \ + "\[^\r\n\]+\[\r\n\]+" \ + "\[^\r\n\]+" \ { \ {$_sdata = void} \ {$_siginfo = void} \ diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 531120c..169ae1c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1099,8 +1099,8 @@ proc gdb_test_exact { args } { # of text per element and then strip trailing \r\n's. # Example: # gdb_test_list_exact "foo" "bar" \ -# {[^\r\n]+[\r\n]+} \ -# {[^\r\n]+} \ +# "\[^\r\n\]+\[\r\n\]+" \ +# "\[^\r\n\]+" \ # { \ # {expected result 1} \ # {expected result 2} \ |