[binutils-gdb] Revert change to gdb.cp/ovldbreak.exp

[Luis Machado <luisgpm at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=008459ea88ad4fdcb7da37dad7f68888ef6ecc47

commit 008459ea88ad4fdcb7da37dad7f68888ef6ecc47
Author: Luis Machado <lgustavo@codesourcery.com>
Date:   Fri Dec 2 11:37:57 2016 -0600

    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:
---
 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 0e06d9e..5a0330c 100644
--- 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 b6c5efd..2c1ff6c 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
+	}
     }
 }