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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d73727cfcb7c07f5608f268057d29a5d1a0df42b..4c90130867e68bad5150fdd1b1f29ac89295ea92 100644 (file)
--- 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 8a8e9046a007b1ac8f7202b57bb974d555f58f0f..3166e5a848a2522e0eeb881c3bc839949c992532 100644 (file)
--- 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)" }
     }