aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Machado <lgustavo@codesourcery.com>2016-12-02 11:37:57 -0600
committerLuis Machado <lgustavo@codesourcery.com>2016-12-02 11:37:57 -0600
commit008459ea88ad4fdcb7da37dad7f68888ef6ecc47 (patch)
treef43ce8958c2975df3f2622655ce0627e3db0385c
parent531336e3a0b79ed60cfc36ad2d6579b6a71175da (diff)
downloadgdb-008459ea88ad4fdcb7da37dad7f68888ef6ecc47.zip
gdb-008459ea88ad4fdcb7da37dad7f68888ef6ecc47.tar.gz
gdb-008459ea88ad4fdcb7da37dad7f68888ef6ecc47.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.cp/ovldbreak.exp4
2 files changed, 9 insertions, 0 deletions
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
+ }
}
}