espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 19:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't handle timeout inside gdb_test_multiple

Browse Source 
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:
Luis Machado
2016-12-01 22:07:02 -06:00
parent 397b8d2a9f
commit 018572b888
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/testsuite/ChangeLog
View File

@ -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> 2016-12-01 Luis Machado <lgustavo@codesourcery.com>
Fix test names and standardize compilation error messages throughout Fix test names and standardize compilation error messages throughout

9
gdb/testsuite/gdb.base/maint.exp
View File

@ -297,9 +297,6 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint pri
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
fail "maint print msymbols" fail "maint print msymbols"
} }
timeout {
fail "(timeout) maint print msymbols"
}
} }
gdb_test "shell rm -f msymbols_output2" ".*" \ gdb_test "shell rm -f msymbols_output2" ".*" \
"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 $" { -re ".*$gdb_prompt $" {
fail "maint print msymbols" fail "maint print msymbols"
} }
timeout {
fail "(timeout) maint print msymbols"
}
} }
} }
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
fail "maint print msymbols" fail "maint print msymbols"
} }
timeout {
fail "(timeout) maint print msymbols"
}
} }
gdb_test "cd ${mydir}" \ gdb_test "cd ${mydir}" \
"Working directory [string_to_regexp ${mydir}]\..*" \ "Working directory [string_to_regexp ${mydir}]\..*" \

10
gdb/testsuite/gdb.cp/gdb2495.exp
View File

@ -117,10 +117,7 @@ if ![runto_main] then {
# behaviour; it should not. Test both on and off states. # behaviour; it should not. Test both on and off states.
# Turn on unwind on signal behaviour. # Turn on unwind on signal behaviour.
gdb_test_multiple "set unwindonsignal on" "turn unwindonsignal on" { gdb_test_no_output "set unwindonsignal on"
-re "$gdb_prompt $" {pass "set unwindonsignal on"}
timeout {fail "(timeout) set unwindonsignal on"}
}
# Check that it is turned on. # Check that it is turned on.
gdb_test "show unwindonsignal" \ gdb_test "show unwindonsignal" \
@ -133,10 +130,7 @@ gdb_test "p exceptions.raise_signal(1)" \
"To change this behavior use \"set unwindonsignal off\".*" "To change this behavior use \"set unwindonsignal off\".*"
# And reverse - turn off again. # And reverse - turn off again.
gdb_test_multiple "set unwindonsignal off" "turn unwindonsignal off" { gdb_test_no_output "set unwindonsignal off"
-re "$gdb_prompt $" {pass "set unwindonsignal off"}
timeout {fail "(timeout) set unwindonsignal off"}
}
# Check that it is actually turned off. # Check that it is actually turned off.
gdb_test "show unwindonsignal" \ gdb_test "show unwindonsignal" \

4
gdb/testsuite/gdb.cp/ovldbreak.exp
View File

@ -58,10 +58,6 @@ proc take_gdb_out_of_choice_menu {} {
gdb_test_multiple " " " " { gdb_test_multiple " " " " {
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
} }
timeout {
perror "could not resynchronize to command prompt (timeout)"
continue
}
} }
} }