From 760f63305aa52e9c18f9d976b74690d25ba587e4 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Tue, 13 Nov 2001 18:54:40 +0000 Subject: [PATCH] 2001-11-07 Michael Snyder * 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/testsuite/ChangeLog | 3 +++ gdb/testsuite/gdb.c++/templates.exp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d73727cfcb..4c90130867 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -36,6 +36,9 @@ 2001-11-07 Michael Snyder + * 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 8a8e9046a0..3166e5a848 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)" } }