2004-02-23 Jeff Johnston <jjohnstn@redhat.com>

        * lib/gdb.exp (gdb_breakpoint): Update query string to match
        new nquery format.
        * gdb.base/pending.exp: Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bbc783737223b95777ee88e599c7c8b59d307e91..2adbef4b7243eba03593ee87f4c5a55445bfeb1f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-23  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * lib/gdb.exp (gdb_breakpoint): Update query string to match
+       new nquery format.
+       * gdb.base/pending.exp: Ditto.
+
 2004-02-22  Mark Kettenis  <kettenis@gnu.org>
 
        * configure.in: Run stabs tests on *BSD.

diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
index 2cef30af5bf5c8e622100836fbdac4b6fd2fbaae..315e544ee743ad87b9d1965e660871b6f6901121 100644 (file)
--- a/gdb/testsuite/gdb.base/pending.exp
+++ b/gdb/testsuite/gdb.base/pending.exp
@@ -111,7 +111,7 @@ if [target_info exists gdb_stub] {
 #
 
 gdb_test_multiple "break pendfunc1" "set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or n. $" {
+     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
            gdb_test "y" "Breakpoint.*pendfunc1.*pending." "set pending breakpoint"
      }
 }
@@ -142,7 +142,7 @@ gdb_test "info break" \
 # Test not setting a pending breakpoint 
 #
 gdb_test_multiple "break pendfunc2" "Don't set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or n. $" {
+     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
            gdb_test "n" "" "Don't set pending breakpoint"
      }
 }
@@ -192,7 +192,7 @@ gdb_test "info break" \
 #
 
 gdb_test_multiple "break pendshr.c:26 if x > 3" "Set pending breakpoint 2" {
-     -re ".*Make breakpoint pending.*y or n. $" {
+     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
            gdb_test "y" "Breakpoint.*pendshr.c:26.*pending." \
                "Set pending breakpoint 2"
      }
@@ -247,7 +247,7 @@ gdb_breakpoint "main"
 # Set non-existent pending breakpoint
 #
 gdb_test_multiple "break imaginary" "set imaginary pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or n. $" {
+     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
            gdb_test "y" "Breakpoint.*imaginary.*pending." \
                "set imaginary pending breakpoint"
      }

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 5cd54abd0236df5a72c2670206bf9af4b8258b48..72d9143ab21854a354c74f2d3922e24957e24403 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -275,7 +275,7 @@ proc gdb_breakpoint { function } {
        -re "Breakpoint \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
        -re "Breakpoint \[0-9\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
        -re "Breakpoint \[0-9\]* at .*$gdb_prompt $" {}
-       -re "Make breakpoint pending.*y or n. $" { 
+       -re "Make breakpoint pending.*y or \\\[n\\\]. $" { 
                send_gdb "n\n"
                exp_continue
        }