Fix racy output matching in gdb.base/multi-attach.exp, gdb.server/ext-{attach, restart, ext-run}.exp

This commit fixes this same problem in several places:

  (gdb) PASS: gdb.multi/multi-attach.exp: backtrace 2
  kill
  Kill the program being debugged? (y or n) y
  (gdb) FAIL: gdb.multi/multi-attach.exp: kill inferior 2 (got interactive prompt)

This is just another case of the gdb_test_multiple's internal "got
interactive prompt" pattern matching because the testcase misses
matching enough.

gdb/testsuite/ChangeLog:
2017-11-09  Pedro Alves  <palves@redhat.com>

	* gdb.multi/multi-attach.exp ("kill" test): Match the whole query
	output.
	* gdb.server/ext-attach.exp ("kill" test): Likewise.
	* gdb.server/ext-restart.exp ("kill" test): Likewise.
	* gdb.server/ext-run.exp ("kill" test): Likewise.
	* gdb.server/ext-wrapper.exp ("kill" test): Likewise.
This commit is contained in:
Pedro Alves 2017-11-09 22:44:09 +00:00
parent a60e07381c
commit 5ed7a928ac
6 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,12 @@
2017-11-09 Pedro Alves <palves@redhat.com>
* gdb.multi/multi-attach.exp ("kill" test): Match the whole query
output.
* gdb.server/ext-attach.exp ("kill" test): Likewise.
* gdb.server/ext-restart.exp ("kill" test): Likewise.
* gdb.server/ext-run.exp ("kill" test): Likewise.
* gdb.server/ext-wrapper.exp ("kill" test): Likewise.
2017-11-09 Pedro Alves <palves@redhat.com>
* gdb.cp/cpcompletion.exp (test_class_complete): Tighten regex to

View File

@ -51,9 +51,9 @@ gdb_test "attach $testpid2" \
"attach to program 2"
gdb_test "backtrace" ".*main.*" "backtrace 2"
gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged. .y or n. " "y"
gdb_test "inferior 1" ".*Switching to inferior 1.*"
gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged. .y or n. " "y"
kill_wait_spawned_process $test_spawn_id1
kill_wait_spawned_process $test_spawn_id2

View File

@ -68,7 +68,7 @@ gdb_test "attach $testpid" \
"attach to remote program 2"
gdb_test "backtrace" ".*main.*" "backtrace 2"
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
gdb_test_no_output "monitor exit"
kill_wait_spawned_process $test_spawn_id

View File

@ -60,6 +60,6 @@ with_test_prefix "restart" {
}
}
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
gdb_test_no_output "monitor exit"

View File

@ -61,7 +61,7 @@ if { [istarget *-*-linux*] } {
}
}
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
gdb_load $binfile
gdb_test "monitor help" "The following monitor commands.*" \

View File

@ -65,6 +65,6 @@ with_test_prefix "restart" {
gdb_test "print d" "\\$${decimal} = ${hex} \"1\".*"
}
gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y"
gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y"
gdb_test_no_output "monitor exit"