From 008459ea88ad4fdcb7da37dad7f68888ef6ecc47 Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Fri, 2 Dec 2016 11:37:57 -0600 Subject: [PATCH] Revert change to gdb.cp/ovldbreak.exp This reverts the timeout handling (removed by 018572b88885ae67d22612937fa1e4fd98d5f5ad) for gdb.cp/ovldbreak.exp until we decide what to do about this particular function. gdb/testsuite/ChangeLog: 2016-12-02 Luis Machado * gdb.base/ovldbreak.exp (take_gdb_out_of_choice_menu): Restore timeout handling. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.cp/ovldbreak.exp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0e06d9ef809..5a0330c618f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-12-02 Luis Machado + + * gdb.base/ovldbreak.exp (take_gdb_out_of_choice_menu): Restore + timeout handling. + 2016-12-02 Tom Tromey * gdb.dwarf2/main-subprogram.c: New file. diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp index b6c5efd7cc2..2c1ff6c9908 100644 --- a/gdb/testsuite/gdb.cp/ovldbreak.exp +++ b/gdb/testsuite/gdb.cp/ovldbreak.exp @@ -58,6 +58,10 @@ proc take_gdb_out_of_choice_menu {} { gdb_test_multiple " " " " { -re ".*$gdb_prompt $" { } + timeout { + perror "could not resynchronize to command prompt (timeout)" + continue + } } } -- 2.30.2