mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-23 19:50:13 +08:00
gdb/testsuite: refactor gdb.threads/detach-step-over.exp
Factor out some bits of gdb.threads/detach-step-over.exp to procs in preparation to adding some new variations of the test. Rename the existing "test" proc and make it use proc_with_prefix. Co-Authored-By: Simon Marchi <simon.marchi@efficios.com> Change-Id: Ib4412545c81c8556029e0f7bfa9dd48d7a9f3189
This commit is contained in:
Andrew Burgess
committed by
Simon Marchi
Simon Marchi
parent
dc41f7e87e
commit
acc175a6b3
@ -56,11 +56,11 @@ standard_testfile
|
||||
|
||||
set bp_lineno [gdb_get_line_number "Set breakpoint here"]
|
||||
|
||||
# The test proper. See description above.
|
||||
proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
# Number of threads started by the program.
|
||||
set n_threads 10
|
||||
# Number of threads started by the program.
|
||||
set n_threads 10
|
||||
|
||||
# Start GDB, configuring various settings according to the arguments.
|
||||
proc start_gdb_for_test {condition_eval target_non_stop non_stop displaced} {
|
||||
save_vars { ::GDBFLAGS } {
|
||||
append ::GDBFLAGS " -ex \"maint set target-non-stop $target_non_stop\""
|
||||
append ::GDBFLAGS " -ex \"set non-stop $non_stop\""
|
||||
@ -69,43 +69,17 @@ proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
clean_restart $::binfile
|
||||
}
|
||||
|
||||
set test_spawn_id [spawn_wait_for_attach $::binfile]
|
||||
set testpid [spawn_id_get_pid $test_spawn_id]
|
||||
|
||||
set any "\[^\r\n\]*"
|
||||
|
||||
gdb_test "add-inferior" "Added inferior 2.*"
|
||||
gdb_test "inferior 2" "Switching to .*"
|
||||
|
||||
gdb_load $::binfile
|
||||
if ![runto setup_done] then {
|
||||
fail "can't run to setup_done"
|
||||
kill_wait_spawned_process $test_spawn_id
|
||||
return
|
||||
}
|
||||
|
||||
gdb_test_no_output "set breakpoint condition-evaluation $condition_eval"
|
||||
}
|
||||
|
||||
# Get the PID of the test process.
|
||||
set pid_inf2 ""
|
||||
gdb_test_multiple "p mypid" "get pid of inferior 2" {
|
||||
-re " = ($::decimal)\r\n$::gdb_prompt $" {
|
||||
set pid_inf2 $expect_out(1,string)
|
||||
pass $gdb_test_name
|
||||
}
|
||||
}
|
||||
|
||||
set attempts 3
|
||||
for {set attempt 1} { $attempt <= $attempts } { incr attempt } {
|
||||
with_test_prefix "iter $attempt" {
|
||||
gdb_test "inferior 1" "Switching to .*"
|
||||
|
||||
# Use the 'attach' command to attach to process with pid TESTPID. Return true
|
||||
# if we believe GDB has attached and we are back at the GDB prompt, otherwise,
|
||||
# return false.
|
||||
proc attach_to {testpid} {
|
||||
with_timeout_factor 2 {
|
||||
set attached 0
|
||||
set saw_attaching 0
|
||||
set eperm 0
|
||||
set test "attach"
|
||||
gdb_test_multiple "attach $testpid" $test {
|
||||
gdb_test_multiple "attach $testpid" "attach" {
|
||||
-re "Attaching to program.*process $testpid\r\n" {
|
||||
set saw_attaching 1
|
||||
exp_continue
|
||||
@ -127,26 +101,31 @@ proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
-re "\r\n$::gdb_prompt " {
|
||||
if { $saw_attaching } {
|
||||
set attached 1
|
||||
pass $test
|
||||
pass $gdb_test_name
|
||||
} else {
|
||||
fail $test
|
||||
fail $gdb_test_name
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if {!$attached} {
|
||||
kill_wait_spawned_process $test_spawn_id
|
||||
return
|
||||
}
|
||||
return $attached
|
||||
}
|
||||
|
||||
if {$non_stop} {
|
||||
# In non-stop, we will see one stop per thread after
|
||||
# the prompt.
|
||||
# After attaching to a multi-threaded inferior in non-stop mode, we expect to
|
||||
# see a stop message from each thread. This proc waits for all of these stop
|
||||
# messages. TID_RE is a regexp used to match the thread-id of the stopped
|
||||
# thread.
|
||||
#
|
||||
# Return true if we saw a stop from each of the expected threads (based on the
|
||||
# global N_THREADS value), otherwise, return false.
|
||||
proc check_stops_after_non_stop_attach {tid_re} {
|
||||
set any "\[^\r\n\]*"
|
||||
|
||||
# In non-stop, we will see one stop per thread after the prompt.
|
||||
set stops 0
|
||||
set tid_re "$::decimal\.$::decimal"
|
||||
set test "seen all stops"
|
||||
for {set thread 1} { $thread <= $n_threads } { incr thread } {
|
||||
for {set thread 1} { $thread <= $::n_threads } { incr thread } {
|
||||
if {[gdb_test_multiple "" $test {
|
||||
-re "Thread ${tid_re} ${any} stopped" {
|
||||
incr stops
|
||||
@ -159,15 +138,32 @@ proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
# If we haven't seen all stops, then the
|
||||
# gdb_test_multiple in the loop above will have
|
||||
# already issued a FAIL.
|
||||
if {$stops != $n_threads} {
|
||||
kill_wait_spawned_process $test_spawn_id
|
||||
return
|
||||
if {$stops != $::n_threads} {
|
||||
return false
|
||||
}
|
||||
pass $test
|
||||
return true
|
||||
}
|
||||
|
||||
# Prepare for a single test iteration. TESTPID is the pid of the process GDB
|
||||
# will be attached too. NON_STOP indicates if GDB is configured in non-stop
|
||||
# mode or not. ATTEMPT is the current attempt number, and ATTEMPTS is the
|
||||
# maximum number of attempts we plan to run. TID_RE is a string used to match
|
||||
# against a thread-id in GDB's stop messages.
|
||||
#
|
||||
# Return true if everything is prepared correctly, otherwise return false.
|
||||
proc prepare_test_iter {testpid non_stop attempt attempts tid_re} {
|
||||
if {![attach_to $testpid]} {
|
||||
return false
|
||||
}
|
||||
|
||||
# Set threads stepping over a breakpoint continuously.
|
||||
gdb_test "break $::srcfile:$::bp_lineno if 0" "Breakpoint.*" \
|
||||
if {$non_stop} {
|
||||
if {![check_stops_after_non_stop_attach $tid_re]} {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
gdb_test "break ${::srcfile}:${::bp_lineno} if 0" "Breakpoint.*" \
|
||||
"break LOC if 0"
|
||||
|
||||
if {$attempt < $attempts} {
|
||||
@ -195,6 +191,46 @@ proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
# breakpoint.
|
||||
sleep 1
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
# The test proper. See the description at the top of the file.
|
||||
proc_with_prefix test_detach_command {condition_eval target_non_stop non_stop displaced} {
|
||||
set test_spawn_id [spawn_wait_for_attach $::binfile]
|
||||
set testpid [spawn_id_get_pid $test_spawn_id]
|
||||
|
||||
start_gdb_for_test $condition_eval $target_non_stop $non_stop $displaced
|
||||
|
||||
gdb_test "add-inferior" "Added inferior 2.*"
|
||||
gdb_test "inferior 2" "Switching to .*"
|
||||
|
||||
gdb_load $::binfile
|
||||
if ![runto setup_done] then {
|
||||
fail "can't run to setup_done"
|
||||
kill_wait_spawned_process $test_spawn_id
|
||||
return
|
||||
}
|
||||
|
||||
# Get the PID of the test process.
|
||||
set pid_inf2 ""
|
||||
gdb_test_multiple "p mypid" "get pid of inferior 2" {
|
||||
-re " = ($::decimal)\r\n$::gdb_prompt $" {
|
||||
set pid_inf2 $expect_out(1,string)
|
||||
pass $gdb_test_name
|
||||
}
|
||||
}
|
||||
|
||||
set attempts 3
|
||||
for {set attempt 1} { $attempt <= $attempts } { incr attempt } {
|
||||
with_test_prefix "iter $attempt" {
|
||||
gdb_test "inferior 1" "Switching to .*"
|
||||
|
||||
if {![prepare_test_iter $testpid $non_stop \
|
||||
$attempt $attempts "$::decimal\.$::decimal"]} {
|
||||
kill_wait_spawned_process $test_spawn_id
|
||||
return
|
||||
}
|
||||
|
||||
set running_count 0
|
||||
set interrupted 0
|
||||
gdb_test_multiple "info threads" "all threads running" {
|
||||
@ -219,7 +255,8 @@ proc test {condition_eval target_non_stop non_stop displaced} {
|
||||
}
|
||||
}
|
||||
-re "$::gdb_prompt $" {
|
||||
gdb_assert {$running_count == ($n_threads + 1) * 2} $gdb_test_name
|
||||
gdb_assert {$running_count == ($::n_threads + 1) * 2} \
|
||||
$gdb_test_name
|
||||
}
|
||||
}
|
||||
|
||||
@ -292,7 +329,8 @@ foreach_with_prefix breakpoint-condition-evaluation {"host" "target"} {
|
||||
}
|
||||
|
||||
foreach_with_prefix displaced {"off" "auto"} {
|
||||
test ${breakpoint-condition-evaluation} ${target-non-stop} ${non-stop} ${displaced}
|
||||
test_detach_command ${breakpoint-condition-evaluation} \
|
||||
${target-non-stop} ${non-stop} ${displaced}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user