From eec52c44580c6571592a0a4e96dba81a32efebb3 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Fri, 20 May 2011 14:37:20 +0000 Subject: [PATCH] * 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. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.base/default.exp | 4 ++-- gdb/testsuite/lib/gdb.exp | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f1e6eea3a1..dd9403761c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2011-05-20 Pierre Muller + + * 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 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 d58c51979f..44dd71105c 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 531120cb4d..169ae1cef4 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} \ -- 2.34.1