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  <lgustavo@codesourcery.com>

	* gdb.base/ovldbreak.exp (take_gdb_out_of_choice_menu): Restore
	timeout handling.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0e06d9ef809c4a9846095f0c9193a8ac50ce38a1..5a0330c618fb36abc55b662f582ef50e6f2e6925 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-02  Luis Machado  <lgustavo@codesourcery.com>
+
+       * gdb.base/ovldbreak.exp (take_gdb_out_of_choice_menu): Restore
+       timeout handling.
+
 2016-12-02  Tom Tromey  <tom@tromey.com>
 
        * gdb.dwarf2/main-subprogram.c: New file.

diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index b6c5efd7cc2a07161aaf8470b43b42f898726f3d..2c1ff6c9908af83b6cc8ad8a03d4107adc28ecee 100644 (file)
--- 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
+       }
     }
 }