* lib/gdb.exp (gdb_test_exact): Turn \n in pattern into \r\n.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8c52eb6f4bd2fbb6d3fc64701f0b3d46c1d734fd..8f93d2d98dd69f401c06081cb9a6f9f6c7a4069a 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug  6 10:23:04 1996  Tom Tromey  <tromey@rtl.cygnus.com>
+
+       * lib/gdb.exp (gdb_test_exact): Turn \n in pattern into \r\n.
+
 Mon Aug  5 18:11:53 1996  Fred Fish  <fnf@cygnus.com>
 
        * gdb.base/signals.exp (test_handle_all_print): Test separately for

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 376b56ed12ac3c624beee1261c41c28322bc3dca..ea411c4a81afe6d3fd207fc43a41344b8e9efaa4 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -477,6 +477,13 @@ proc gdb_test_exact { args } {
 
     set command [lindex $args 0]
     set pattern [string_to_regexp [lindex $args 1]]
+    # It is most natural to write the pattern argument with only
+    # embedded \n's, especially if you are trying to avoid Tcl quoting
+    # problems.  But expect really wants to see \r\n in patterns.  So
+    # transform the pattern here.  First transform \r\n back to \n, in
+    # case some users of gdb_test_exact already do the right thing.
+    regsub -all "\r\n" $pattern "\n" pattern
+    regsub -all "\n" $pattern "\r\n" pattern
     if [llength $args]==3 then {
        set message [lindex $args 2]
     } else {