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

gdb/testsuite: remove use of then keyword from gdb.threads/*.exp

Browse Source 
The canonical form of 'if' in modern TCL is 'if {} {}'.  But there's
still a bunch of places in the testsuite where we make use of the
'then' keyword, and sometimes these get copies into new tests, which
just spreads poor practice.

This commit removes all use of the 'then' keyword from the gdb.threads/
test script directory.

There should be no changes in what is tested after this commit.
This commit is contained in:
Andrew Burgess
2022-11-14 14:15:49 +00:00
parent b0e16ca58d
commit b8ffa8b327
38 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/testsuite/gdb.threads/clone-new-thread-event.exp
View File

@ -16,7 +16,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# This only works on targets with the Linux kernel. # This only works on targets with the Linux kernel.
if ![istarget *-*-linux*] then { if {![istarget *-*-linux*]} {
return return
} }

2
gdb/testsuite/gdb.threads/current-lwp-dead.exp
View File

@ -25,7 +25,7 @@
standard_testfile standard_testfile
# This only works with on Linux targets. # This only works with on Linux targets.
if ![istarget *-*-linux*] then { if {![istarget *-*-linux*]} {
return return
} }

2
gdb/testsuite/gdb.threads/detach-step-over.exp
View File

@ -205,7 +205,7 @@ proc_with_prefix test_detach_command {condition_eval target_non_stop non_stop di
gdb_test "inferior 2" "Switching to .*" gdb_test "inferior 2" "Switching to .*"
gdb_load $::binfile gdb_load $::binfile
if ![runto setup_done] then { if {![runto setup_done]} {
fail "can't run to setup_done" fail "can't run to setup_done"
kill_wait_spawned_process $test_spawn_id kill_wait_spawned_process $test_spawn_id
return return

2
gdb/testsuite/gdb.threads/fork-child-threads.exp
View File

@ -26,7 +26,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/fork-plus-threads.exp
View File

@ -45,7 +45,7 @@ proc do_test { detach-on-fork } {
set GDBFLAGS $saved_gdbflags set GDBFLAGS $saved_gdbflags
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

4
gdb/testsuite/gdb.threads/fork-thread-pending.exp
View File

@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }
@ -84,7 +84,7 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile} gdb_load ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

4
gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
View File

@ -38,7 +38,7 @@ proc probe_displaced_stepping_support {} {
clean_restart $binfile clean_restart $binfile
gdb_test_no_output "set displaced on" gdb_test_no_output "set displaced on"
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }
@ -77,7 +77,7 @@ proc do_test { cond_bp_target detach_on_fork displaced } {
clean_restart $binfile clean_restart $binfile
set GDBFLAGS $saved_gdbflags set GDBFLAGS $saved_gdbflags
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/gcore-stale-thread.exp
View File

@ -24,7 +24,7 @@ clean_restart ${testfile}
gdb_test_no_output "set non-stop on" gdb_test_no_output "set non-stop on"
if { ! [ runto_main ] } then { if {![runto_main]} {
return -1 return -1
} }

4
gdb/testsuite/gdb.threads/gcore-thread.exp
View File

@ -22,7 +22,7 @@ set objfile $binfile.o
set corefile $binfile.test set corefile $binfile.test
set core0file ${binfile}0.test set core0file ${binfile}0.test
if [istarget "*-*-linux"] then { if {[istarget "*-*-linux"]} {
set target_cflags "-D_MIT_POSIX_THREADS" set target_cflags "-D_MIT_POSIX_THREADS"
} else { } else {
set target_cflags "" set target_cflags ""
@ -55,7 +55,7 @@ set nl "\[\r\n\]+"
set timeout 30 set timeout 30
if { ! [ runto_main ] } then { if {![runto_main]} {
return -1 return -1
} }

2
gdb/testsuite/gdb.threads/kill.exp
View File

@ -38,7 +38,7 @@ proc test {threaded} {
return -1 return -1
} }
if { ![runto_main] } then { if {![runto_main]} {
return return
} }

2
gdb/testsuite/gdb.threads/linux-dp.exp
View File

@ -35,7 +35,7 @@
# This only works with Linux configurations. # This only works with Linux configurations.
if ![istarget *-*-linux-gnu*] then { if {![istarget *-*-linux-gnu*]} {
return return
} }

2
gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
View File

@ -34,7 +34,7 @@ clean_restart ${binfile}
gdb_test_no_output "set can-use-hw-watchpoints 1" "" gdb_test_no_output "set can-use-hw-watchpoints 1" ""
if ![runto_main] then { if {![runto_main]} {
return return
} }

2
gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
View File

@ -25,7 +25,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
clean_restart "${binfile}" clean_restart "${binfile}"
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
View File

@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" \
return -1 return -1
} }
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/pending-step.exp
View File

@ -56,7 +56,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
View File

@ -45,7 +45,7 @@ proc do_test { non_stop cond_bp_target } {
clean_restart $binfile clean_restart $binfile
set GDBFLAGS $saved_gdbflags set GDBFLAGS $saved_gdbflags
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

16
gdb/testsuite/gdb.threads/pthreads.exp
View File

@ -27,7 +27,7 @@ standard_testfile
# carriage return) # carriage return)
set horiz "\[^\n\r\]*" set horiz "\[^\n\r\]*"
if [istarget "*-*-linux"] then { if {[istarget "*-*-linux"]} {
set target_cflags "-D_MIT_POSIX_THREADS" set target_cflags "-D_MIT_POSIX_THREADS"
} else { } else {
set target_cflags "" set target_cflags ""
@ -79,7 +79,7 @@ proc all_threads_running {} {
} }
} }
if { $return_me == 1 } then { if {$return_me == 1} {
return 0 return 0
} }
@ -139,7 +139,7 @@ proc test_startup {} {
} }
} }
if { $return_me == 1 } then { if {$return_me == 1} {
return 0 return 0
} }
@ -189,7 +189,7 @@ proc check_control_c {} {
# Verify that all threads are running. # Verify that all threads are running.
with_test_prefix "after startup" { with_test_prefix "after startup" {
if [all_threads_running] then { if {[all_threads_running]} {
pass "all threads running after startup" pass "all threads running after startup"
} }
} }
@ -219,7 +219,7 @@ proc check_control_c {} {
# Verify that all threads can be run again after a ^C stop. # Verify that all threads can be run again after a ^C stop.
with_test_prefix "after continue" { with_test_prefix "after continue" {
if [all_threads_running] then { if {[all_threads_running]} {
pass "all threads running after continuing from ^C stop" pass "all threads running after continuing from ^C stop"
} }
} }
@ -345,9 +345,9 @@ proc check_qcs {} {
} }
if [runto_main] then { if {[runto_main]} {
if [test_startup] then { if {[test_startup]} {
if [check_control_c] then { if {[check_control_c]} {
warning "Could not stop child with ^C; skipping rest of tests.\n" warning "Could not stop child with ^C; skipping rest of tests.\n"
return return
} }

2
gdb/testsuite/gdb.threads/reconnect-signal.exp
View File

@ -33,7 +33,7 @@ if { [gdb_compile_pthreads \
clean_restart $executable clean_restart $executable
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
View File

@ -40,7 +40,7 @@ proc test { step_over } {
with_test_prefix "step-over $step_over" { with_test_prefix "step-over $step_over" {
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
View File

@ -37,7 +37,7 @@ proc test { schedlock } {
with_test_prefix "schedlock $schedlock" { with_test_prefix "schedlock $schedlock" {
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
View File

@ -34,7 +34,7 @@ proc test { command } {
with_test_prefix "$command" { with_test_prefix "$command" {
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/signal-sigtrap.exp
View File

@ -37,7 +37,7 @@ proc test { sigtrap_thread } {
with_test_prefix "sigtrap thread $sigtrap_thread" { with_test_prefix "sigtrap thread $sigtrap_thread" {
clean_restart ${binfile} clean_restart ${binfile}
if ![runto "thread_function"] then { if {![runto "thread_function"]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/sigthread.exp
View File

@ -23,7 +23,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/stop-with-handle.exp
View File

@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" \
return -1 return -1
} }
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

20
gdb/testsuite/gdb.threads/thread-find.exp
View File

@ -67,7 +67,7 @@ gdb_test_multiple "info threads" "collect thread id" {
} }
} }
if { [info exists thread6] } then { if {[info exists thread6]} {
gdb_test "echo $thread6\\n" "$thread6" "got thread ids" gdb_test "echo $thread6\\n" "$thread6" "got thread ids"
} }
@ -84,7 +84,7 @@ gdb_test_multiple "info threads" "collect thread id" {
} }
} }
if { [info exists process6] } then { if {[info exists process6]} {
gdb_test "echo $process6\\n" "$process6" "got process ids" gdb_test "echo $process6\\n" "$process6" "got process ids"
} }
@ -101,7 +101,7 @@ gdb_test_multiple "info threads" "collect thread id" {
} }
} }
if { [info exists lwp6] } then { if {[info exists lwp6]} {
gdb_test "echo $lwp6\\n" "$lwp6" "got lwp ids" gdb_test "echo $lwp6\\n" "$lwp6" "got lwp ids"
} }
@ -126,7 +126,7 @@ gdb_test "thread find threadname_1" \
# Test 'thread find' with thread ids, if any. # Test 'thread find' with thread ids, if any.
# #
if { [info exists thread6] } then { if {[info exists thread6]} {
gdb_test "thread find $thread6" \ gdb_test "thread find $thread6" \
"Thread 6 has .*$thread6.*" "find thread id 6" "Thread 6 has .*$thread6.*" "find thread id 6"
gdb_test "thread find $thread5" \ gdb_test "thread find $thread5" \
@ -145,7 +145,7 @@ if { [info exists thread6] } then {
# Test 'thread find' with process ids, if any. # Test 'thread find' with process ids, if any.
# #
if { [info exists process6] } then { if {[info exists process6]} {
gdb_test "thread find $process6" \ gdb_test "thread find $process6" \
"Thread 6 has .*$process6.*" "find process id 6" "Thread 6 has .*$process6.*" "find process id 6"
gdb_test "thread find $process5" \ gdb_test "thread find $process5" \
@ -164,7 +164,7 @@ if { [info exists process6] } then {
# Test 'thread find' with lwp ids, if any. # Test 'thread find' with lwp ids, if any.
# #
if { [info exists lwp6] } then { if {[info exists lwp6]} {
gdb_test "thread find $lwp6" \ gdb_test "thread find $lwp6" \
"Thread 6 has .*$lwp6.*" "find lwp id 6" "Thread 6 has .*$lwp6.*" "find lwp id 6"
gdb_test "thread find $lwp5" \ gdb_test "thread find $lwp5" \
@ -197,7 +197,7 @@ gdb_test_multiple "thread find threadname_\[345\]" "test regular exp" {
exp_continue exp_continue
} }
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
if { $see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6 } then { if {$see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6} {
pass "test regular exp" pass "test regular exp"
} else { } else {
fail "test regular exp" fail "test regular exp"
@ -219,7 +219,7 @@ gdb_test_multiple "info threads 2 4 6" "info threads 2 4 6" {
exp_continue exp_continue
} }
-re "$gdb_prompt $" { -re "$gdb_prompt $" {
if { $see2 && $see4 && $see6 && !$see1 && !$see3 && !$see5 } then { if {$see2 && $see4 && $see6 && !$see1 && !$see3 && !$see5} {
pass "info threads 2 4 6" pass "info threads 2 4 6"
} else { } else {
fail "info threads 2 4 6" fail "info threads 2 4 6"
@ -241,7 +241,7 @@ gdb_test_multiple "info threads 3-5" "info threads 3-5" {
exp_continue exp_continue
} }
-re "$gdb_prompt $" { -re "$gdb_prompt $" {
if { $see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6 } then { if {$see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6} {
pass "info threads 3-5" pass "info threads 3-5"
} else { } else {
fail "info threads 3-5" fail "info threads 3-5"
@ -265,7 +265,7 @@ gdb_test_multiple "info threads 3-3" "info threads 3-3" {
exp_continue exp_continue
} }
-re ".*$gdb_prompt $" { -re ".*$gdb_prompt $" {
if { $see3 && !$see1 && !$see2 && !$see4 && !$see5 && !$see6 } then { if {$see3 && !$see1 && !$see2 && !$see4 && !$see5 && !$see6} {
pass "info threads 3-3" pass "info threads 3-3"
} else { } else {
fail "info threads 3-3" fail "info threads 3-3"

2
gdb/testsuite/gdb.threads/thread_check.exp
View File

@ -41,7 +41,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 1 return 1
} }

4
gdb/testsuite/gdb.threads/thread_events.exp
View File

@ -23,7 +23,7 @@
# This test has only been verified with Linux targets, and would need # This test has only been verified with Linux targets, and would need
# to be generalized to support other targets # to be generalized to support other targets
if ![istarget *-*-linux*] then { if {![istarget *-*-linux*]} {
return return
} }
@ -112,7 +112,7 @@ proc test_thread_messages {enabled} {
# The initial thread may log a 'New Thread' message, but we don't # The initial thread may log a 'New Thread' message, but we don't
# check for it. # check for it.
if ![runto_main] then { if {![runto_main]} {
return 1 return 1
} }

2
gdb/testsuite/gdb.threads/threadapply.exp
View File

@ -31,7 +31,7 @@ clean_restart ${binfile}
# Run to `main' where we begin our tests. # Run to `main' where we begin our tests.
# #
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
View File

@ -21,7 +21,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
} }
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

4
gdb/testsuite/gdb.threads/tls-nodebug.exp
View File

@ -16,7 +16,7 @@
standard_testfile standard_testfile
if [istarget "*-*-linux"] then { if {[istarget "*-*-linux"]} {
set target_cflags "-D_MIT_POSIX_THREADS" set target_cflags "-D_MIT_POSIX_THREADS"
} else { } else {
set target_cflags "" set target_cflags ""
@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
} }
clean_restart ${binfile} clean_restart ${binfile}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/tls-shared.exp
View File

@ -32,7 +32,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
clean_restart ${binfile} clean_restart ${binfile}
gdb_load_shlib ${binfile_lib} gdb_load_shlib ${binfile_lib}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/tls-so_extern.exp
View File

@ -31,7 +31,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
clean_restart ${binfile} clean_restart ${binfile}
gdb_load_shlib ${binfile_lib} gdb_load_shlib ${binfile_lib}
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

4
gdb/testsuite/gdb.threads/tls.exp
View File

@ -18,7 +18,7 @@ load_lib gdb-python.exp
standard_testfile tls.c tls2.c standard_testfile tls.c tls2.c
if [istarget "*-*-linux"] then { if {[istarget "*-*-linux"]} {
set target_cflags "-D_MIT_POSIX_THREADS" set target_cflags "-D_MIT_POSIX_THREADS"
} else { } else {
set target_cflags "" set target_cflags ""
@ -167,7 +167,7 @@ gdb_test_multiple "print a_thread_local" "" {
} }
} }
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
View File

@ -30,7 +30,7 @@ proc test_vfork {detach} {
clean_restart $binfile clean_restart $binfile
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
View File

@ -30,7 +30,7 @@ proc test_vfork {detach} {
clean_restart $binfile clean_restart $binfile
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/watchthreads.exp
View File

@ -44,7 +44,7 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
# Run to `main' where we begin our tests. # Run to `main' where we begin our tests.
# #
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/watchthreads2.exp
View File

@ -41,7 +41,7 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
# Run to `main' where we begin our tests. # Run to `main' where we begin our tests.
# #
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }

2
gdb/testsuite/gdb.threads/wp-replication.exp
View File

@ -42,7 +42,7 @@ clean_restart ${binfile}
gdb_test_no_output "set can-use-hw-watchpoints 1" "" gdb_test_no_output "set can-use-hw-watchpoints 1" ""
# Run to `main' where we begin our tests. # Run to `main' where we begin our tests.
if ![runto_main] then { if {![runto_main]} {
return 0 return 0
} }