* 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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f1e6eea..dd94037 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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} \