summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2001-11-13 18:54:40 +0000
committerMichael Snyder <msnyder@vmware.com>2001-11-13 18:54:40 +0000
commit760f63305aa52e9c18f9d976b74690d25ba587e4 (patch)
tree097d9bd3d86d089bd77b80263728c2ca9896107f
parent3fe0dc10b4c2f1e83f693ded633a2e0d500c0c5e (diff)
downloadbinutils-gdb-760f63305aa52e9c18f9d976b74690d25ba587e4.tar.gz
2001-11-07 Michael Snyder <msnyder@redhat.com>
* gdb.c++/templates.exp (test_template_breakpoints): If we get an overload menu, but it does not match what we expect, we still need to issue the "cancel" command.
-rw-r--r--gdb/testsuite/ChangeLog3
-rw-r--r--gdb/testsuite/gdb.c++/templates.exp6
2 files changed, 8 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d73727cfcb7..4c90130867e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -36,6 +36,9 @@
2001-11-07 Michael Snyder <msnyder@redhat.com>
+ * gdb.c++/templates.exp (test_template_breakpoints):
+ If we get an overload menu, but it does not match what
+ we expect, we still need to issue the "cancel" command.
* gdb.c++/templates.exp: Replace "void \\*" with "void ?\\*",
making the whitespace optional. Argument for "new" may be
"unsigned" as well as "unsigned int/long".
diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.c++/templates.exp
index 8a8e9046a00..3166e5a848a 100644
--- a/gdb/testsuite/gdb.c++/templates.exp
+++ b/gdb/testsuite/gdb.c++/templates.exp
@@ -114,7 +114,11 @@ proc test_template_breakpoints {} {
"canceled" \
"constructor breakpoint"
}
- -re ".*\n> $" { fail "constructor breakpoint" }
+ -re ".*\n> $" {
+ gdb_test "0" \
+ "nonsense intended to insure that this test fails" \
+ "constructor breakpoint (bad menu choices)"
+ }
-re ".*$gdb_prompt $" { fail "constructor breakpoint" }
default { fail "constructor breakpoint (timeout)" }
}