Don't handle timeout inside gdb_test_multiple
This fixes a few cases where the testcase is explicitly handling timeouts inside gdb_test_multiple when it is not necessary. It also converts two gdb_test_multiple calls to gdb_test_no_output calls (also removing the timeout handling). gdb/testsuite/ChangeLog: 2016-12-01 Luis Machado <lgustavo@codesourcery.com> * gdb.base/maint.exp: Remove timeout handling for gdb_test_multiple. * gdb.cp/gdb2495.exp: Likewise and convert gdb_test_multiple into gdb_test_no_output for a couple of cases. * gdb.cp/ovldbreak.exp: Remove timeout handling for gdb_test_multiple.
This commit is contained in:
parent
397b8d2a9f
commit
018572b888
|
@ -1,3 +1,10 @@
|
|||
2016-12-01 Luis Machado <lgustavo@codesourcery.com>
|
||||
|
||||
* gdb.base/maint.exp: Remove timeout handling for gdb_test_multiple.
|
||||
* gdb.cp/gdb2495.exp: Likewise and convert gdb_test_multiple into
|
||||
gdb_test_no_output for a couple of cases.
|
||||
* gdb.cp/ovldbreak.exp: Remove timeout handling for gdb_test_multiple.
|
||||
|
||||
2016-12-01 Luis Machado <lgustavo@codesourcery.com>
|
||||
|
||||
Fix test names and standardize compilation error messages throughout
|
||||
|
|
|
@ -297,9 +297,6 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint pri
|
|||
-re ".*$gdb_prompt $" {
|
||||
fail "maint print msymbols"
|
||||
}
|
||||
timeout {
|
||||
fail "(timeout) maint print msymbols"
|
||||
}
|
||||
}
|
||||
gdb_test "shell rm -f msymbols_output2" ".*" \
|
||||
"shell rm -f msymbols_output2"
|
||||
|
@ -307,17 +304,11 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint pri
|
|||
-re ".*$gdb_prompt $" {
|
||||
fail "maint print msymbols"
|
||||
}
|
||||
timeout {
|
||||
fail "(timeout) maint print msymbols"
|
||||
}
|
||||
}
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
fail "maint print msymbols"
|
||||
}
|
||||
timeout {
|
||||
fail "(timeout) maint print msymbols"
|
||||
}
|
||||
}
|
||||
gdb_test "cd ${mydir}" \
|
||||
"Working directory [string_to_regexp ${mydir}]\..*" \
|
||||
|
|
|
@ -117,10 +117,7 @@ if ![runto_main] then {
|
|||
# behaviour; it should not. Test both on and off states.
|
||||
|
||||
# Turn on unwind on signal behaviour.
|
||||
gdb_test_multiple "set unwindonsignal on" "turn unwindonsignal on" {
|
||||
-re "$gdb_prompt $" {pass "set unwindonsignal on"}
|
||||
timeout {fail "(timeout) set unwindonsignal on"}
|
||||
}
|
||||
gdb_test_no_output "set unwindonsignal on"
|
||||
|
||||
# Check that it is turned on.
|
||||
gdb_test "show unwindonsignal" \
|
||||
|
@ -133,10 +130,7 @@ gdb_test "p exceptions.raise_signal(1)" \
|
|||
"To change this behavior use \"set unwindonsignal off\".*"
|
||||
|
||||
# And reverse - turn off again.
|
||||
gdb_test_multiple "set unwindonsignal off" "turn unwindonsignal off" {
|
||||
-re "$gdb_prompt $" {pass "set unwindonsignal off"}
|
||||
timeout {fail "(timeout) set unwindonsignal off"}
|
||||
}
|
||||
gdb_test_no_output "set unwindonsignal off"
|
||||
|
||||
# Check that it is actually turned off.
|
||||
gdb_test "show unwindonsignal" \
|
||||
|
|
|
@ -58,10 +58,6 @@ proc take_gdb_out_of_choice_menu {} {
|
|||
gdb_test_multiple " " " " {
|
||||
-re ".*$gdb_prompt $" {
|
||||
}
|
||||
timeout {
|
||||
perror "could not resynchronize to command prompt (timeout)"
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue