aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2004-02-23 19:27:46 +0000
committerJeff Johnston <jjohnstn@redhat.com>2004-02-23 19:27:46 +0000
commit9f27c60433af8f115cd5c7381e60e4e2c0619d74 (patch)
tree8f6168d53317c567408640e79c1dfb6d7f15a3ea
parent3457d66e5b39f21ab507d9c505127352163f6f0c (diff)
downloadgdb-9f27c60433af8f115cd5c7381e60e4e2c0619d74.zip
gdb-9f27c60433af8f115cd5c7381e60e4e2c0619d74.tar.gz
gdb-9f27c60433af8f115cd5c7381e60e4e2c0619d74.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/pending.exp8
-rw-r--r--gdb/testsuite/lib/gdb.exp2
3 files changed, 11 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bbc7837..2adbef4 100644
--- 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 2cef30a..315e544 100644
--- 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 5cd54ab..72d9143 100644
--- 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
}