gdb/testsuite/

Fix double send_gdb leading to racy FAILs.
	* gdb.base/break.exp (set silent break bp_location1): Replace
	3x send_gdb and gdb_expect by gdb_test.
	* gdb.base/fileio.exp: Replace 2x send_gdb by gdb_exit and sleep.
	* gdb.base/foll-vfork.exp (vfork_and_exec_child_follow_to_main_bp)
	(vfork_and_exec_child_follow_through_step): Use gdb_test_no_output
	instead of send_gdb.  Twice.
	* gdb.base/sepdebug.exp (set silent break bp_location1): Replace
	3x send_gdb and gdb_expect by gdb_test.
	* gdb.mi/mi-nsmoribund.exp: Replace 3x send_gdb by mi_gdb_test.
This commit is contained in:
Jan Kratochvil 2011-12-26 11:24:55 +00:00
parent 15daccb2f7
commit e809353af1
6 changed files with 23 additions and 23 deletions

View file

@ -1,3 +1,16 @@
2011-12-26 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix double send_gdb leading to racy FAILs.
* gdb.base/break.exp (set silent break bp_location1): Replace
3x send_gdb and gdb_expect by gdb_test.
* gdb.base/fileio.exp: Replace 2x send_gdb by gdb_exit and sleep.
* gdb.base/foll-vfork.exp (vfork_and_exec_child_follow_to_main_bp)
(vfork_and_exec_child_follow_through_step): Use gdb_test_no_output
instead of send_gdb. Twice.
* gdb.base/sepdebug.exp (set silent break bp_location1): Replace
3x send_gdb and gdb_expect by gdb_test.
* gdb.mi/mi-nsmoribund.exp: Replace 3x send_gdb by mi_gdb_test.
2011-12-23 Jan Kratochvil <jan.kratochvil@redhat.com> 2011-12-23 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.linespec/linespec.exp: Compile using {c++}. * gdb.linespec/linespec.exp: Compile using {c++}.

View file

@ -576,14 +576,7 @@ gdb_test_multiple "break $bp_location1" \
} }
} }
send_gdb "commands $expect_out(1,string)\n" gdb_test "commands $expect_out(1,string)\nsilent\nend" ">end" "set silent break bp_location1"
send_gdb "silent\n"
send_gdb "end\n"
gdb_expect {
-re ".*$gdb_prompt $"\
{pass "set silent break bp_location1"}
timeout {fail "(timeout) set silent break bp_location1"}
}
gdb_test "info break $expect_out(1,string)" \ gdb_test "info break $expect_out(1,string)" \
"\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*" \ "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*" \

View file

@ -247,8 +247,9 @@ gdb_test continue \
"Continuing\\..*time 2:.*OK$stop_msg" \ "Continuing\\..*time 2:.*OK$stop_msg" \
"Time(2) returns feasible values" "Time(2) returns feasible values"
send_gdb "quit\n" gdb_exit
send_gdb "y\n" # Wait till GDB really exits.
sleep 1
remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test} remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
remote_exec build {sh -xc rm\ -rf\ *.fileio.test} remote_exec build {sh -xc rm\ -rf\ *.fileio.test}

View file

@ -166,7 +166,7 @@ proc vfork_and_exec_child_follow_to_main_bp {} {
send_gdb "kill\n" send_gdb "kill\n"
gdb_expect { gdb_expect {
-re ".*Kill the program being debugged.*y or n. $" { -re ".*Kill the program being debugged.*y or n. $" {
send_gdb "y\n" gdb_test_no_output "y" ""
send_gdb "file $binfile\n" send_gdb "file $binfile\n"
gdb_expect { gdb_expect {
-re ".*Load new symbol table from.*y or n. $" { -re ".*Load new symbol table from.*y or n. $" {
@ -224,7 +224,7 @@ proc vfork_and_exec_child_follow_through_step {} {
send_gdb "kill\n" send_gdb "kill\n"
gdb_expect { gdb_expect {
-re ".*Kill the program being debugged.*y or n. $" { -re ".*Kill the program being debugged.*y or n. $" {
send_gdb "y\n" gdb_test_no_output "y" ""
send_gdb "file $binfile\n" send_gdb "file $binfile\n"
gdb_expect { gdb_expect {
-re ".*Load new symbol table from.*y or n. $" { -re ".*Load new symbol table from.*y or n. $" {

View file

@ -370,14 +370,7 @@ gdb_test_multiple "break $bp_location1" \
} }
} }
send_gdb "commands $expect_out(1,string)\n" gdb_test "commands $expect_out(1,string)\nsilent\nend" ">end" "set silent break bp_location1"
send_gdb "silent\n"
send_gdb "end\n"
gdb_expect {
-re ".*$gdb_prompt $"\
{pass "set silent break bp_location1"}
timeout {fail "(timeout) set silent break bp_location1"}
}
gdb_test "info break $expect_out(1,string)" \ gdb_test "info break $expect_out(1,string)" \
"\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*" \ "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*" \

View file

@ -118,9 +118,9 @@ mi_check_thread_states \
# we are interested in, so we can't use mi_gdb_test or # we are interested in, so we can't use mi_gdb_test or
# gdb_test_multiple (or an MI equivalent) # gdb_test_multiple (or an MI equivalent)
send_gdb "102-break-delete\n" mi_gdb_test "102-break-delete" "102\\^done.*"
send_gdb "print done = 1\n" mi_gdb_test "print done = 1" { = 1"}
send_gdb "103-exec-continue --all\n" mi_gdb_test "103-exec-continue --all" "\[^\n\]*\r\n$running_re"
gdb_expect { gdb_expect {
-re "\\*stopped,reason=\"exited-normally\"" { -re "\\*stopped,reason=\"exited-normally\"" {