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

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.

diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
index db5ae39aded2583bb2ed880a20f981dedbead6c9..abaad97ebccd040801a8705f1400e13c6f955f42 100644 (file)
--- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
+++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This only works on targets with the Linux kernel.
-if ![istarget *-*-linux*] then {
+if {![istarget *-*-linux*]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.threads/current-lwp-dead.exp b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
index 6728dbe87ab29e035b83889de006bbabf4992761..51866b45b0b353dd5f3358d7d58cb22522b161be 100644 (file)
--- a/gdb/testsuite/gdb.threads/current-lwp-dead.exp
+++ b/gdb/testsuite/gdb.threads/current-lwp-dead.exp
@@ -25,7 +25,7 @@
 standard_testfile
 
 # This only works with on Linux targets.
-if ![istarget *-*-linux*] then {
+if {![istarget *-*-linux*]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.threads/detach-step-over.exp b/gdb/testsuite/gdb.threads/detach-step-over.exp
index d2cb52423d984237b189f4e2d2f4e661f4d83535..38d796620cb13d748168ab949a83a288fb086dc0 100644 (file)
--- a/gdb/testsuite/gdb.threads/detach-step-over.exp
+++ b/gdb/testsuite/gdb.threads/detach-step-over.exp
@@ -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_load $::binfile
-    if ![runto setup_done] then {
+    if {![runto setup_done]} {
        fail "can't run to setup_done"
        kill_wait_spawned_process $test_spawn_id
        return

diff --git a/gdb/testsuite/gdb.threads/fork-child-threads.exp b/gdb/testsuite/gdb.threads/fork-child-threads.exp
index f2718738cbf567dbb20c7aaf4212dbb47308dab0..4671c56e50e75c56ad9d2d30a0559602bddb3c38 100644 (file)
--- a/gdb/testsuite/gdb.threads/fork-child-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-child-threads.exp
@@ -26,7 +26,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index 845d859f95a0120a6cbe1f5ab560e265d96ec36a..55ba77c608f600bf3427cdfacdfccba1ea764cac 100644 (file)
--- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
@@ -45,7 +45,7 @@ proc do_test { detach-on-fork } {
 
     set GDBFLAGS $saved_gdbflags
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
index f83df4e8bc49c6b6cc41dd4b5e564a170e1d7bcd..4ca2284d6e838d366eae5a76582b8b214fd2ab56 100644 (file)
--- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp
+++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp
@@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 
@@ -84,7 +84,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 
 gdb_load ${binfile}
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
index a8b3b62f3b556c7694b401fc674967544ca65a01..575761e69a10022a1694bd7639b4799fb79cc02a 100644 (file)
--- a/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
+++ b/gdb/testsuite/gdb.threads/forking-threads-plus-breakpoint.exp
@@ -38,7 +38,7 @@ proc probe_displaced_stepping_support {} {
        clean_restart $binfile
 
        gdb_test_no_output "set displaced on"
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
 
@@ -77,7 +77,7 @@ proc do_test { cond_bp_target detach_on_fork displaced } {
     clean_restart $binfile
     set GDBFLAGS $saved_gdbflags
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
index 01a4dc2a7537ada31460864393e0d4988c06a92a..0811ce8f06b89102d111cc1042865040ac747706 100644 (file)
--- a/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-stale-thread.exp
@@ -24,7 +24,7 @@ clean_restart ${testfile}
 
 gdb_test_no_output "set non-stop on"
 
-if { ! [ runto_main ] } then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
index 4a77fd69509dc7247514cd2f67247c1a0c4adb43..b6108b629a48025abf4fe974adc96d1f5b95e783 100644 (file)
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ b/gdb/testsuite/gdb.threads/gcore-thread.exp
@@ -22,7 +22,7 @@ set objfile  $binfile.o
 set corefile $binfile.test
 set core0file ${binfile}0.test
 
-if [istarget "*-*-linux"] then {
+if {[istarget "*-*-linux"]} {
     set target_cflags "-D_MIT_POSIX_THREADS"
 } else {
     set target_cflags ""
@@ -55,7 +55,7 @@ set nl "\[\r\n\]+"
 
 set timeout 30
 
-if { ! [ runto_main ] } then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.threads/kill.exp b/gdb/testsuite/gdb.threads/kill.exp
index a80c1239eff017fed78f6b61644a419fec95b6ac..992d18236acbc96f14c0d3688acb32ac8523fcd7 100644 (file)
--- a/gdb/testsuite/gdb.threads/kill.exp
+++ b/gdb/testsuite/gdb.threads/kill.exp
@@ -38,7 +38,7 @@ proc test {threaded} {
            return -1
        }
 
-       if { ![runto_main] } then {
+       if {![runto_main]} {
            return
        }
 

diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index 953e6a9756b52426a4c284e19bcb3ce1d18b9472..84c68e7cace9fb6e0dad2ada54bc6dd9a0555d30 100644 (file)
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -35,7 +35,7 @@
 
 
 # This only works with Linux configurations.
-if ![istarget *-*-linux-gnu*] then {
+if {![istarget *-*-linux-gnu*]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
index e94c875f2762c6212acd8d41d7ca6424e32361d4..9ddcd589226bce49ea3be63a41e0b643cde62144 100644 (file)
--- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
+++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp
@@ -34,7 +34,7 @@ clean_restart ${binfile}
 
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
-if ![runto_main] then {
+if {![runto_main]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
index b950107f3d07f780d4b60d66798b576c0cb4ded0..4e9541295782e05ba676f7298b65b9c2a509d9d1 100644 (file)
--- a/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
+++ b/gdb/testsuite/gdb.threads/multiple-successive-infcall.exp
@@ -25,7 +25,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 
 clean_restart "${binfile}"
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
index a703e8417694bba6babc5fbdd86f5a565dade9c0..e78ccced941650d93a9e289873ea4037455d2c7d 100644 (file)
--- a/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
+++ b/gdb/testsuite/gdb.threads/next-while-other-thread-longjmps.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index 89d1ecd853d6a5cd370f6f3f73ddf963e469d059..158cfed405738682ac47297302e8436388befec0 100644 (file)
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -56,7 +56,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
index d630805941525637e9b389c98d08351099d36c9a..626143493c064abe80e6ff9eae730f3c38d56918 100644 (file)
--- a/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
+++ b/gdb/testsuite/gdb.threads/process-dies-while-handling-bp.exp
@@ -45,7 +45,7 @@ proc do_test { non_stop cond_bp_target } {
     clean_restart $binfile
     set GDBFLAGS $saved_gdbflags
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index d2df4e071591f09acbc4fdd0a934b66a2c9da5f6..4cd104fb7b95d016f93a16e627943bb33f2ff094 100644 (file)
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ b/gdb/testsuite/gdb.threads/pthreads.exp
@@ -27,7 +27,7 @@ standard_testfile
 # carriage return)
 set horiz "\[^\n\r\]*"
 
-if [istarget "*-*-linux"] then {
+if {[istarget "*-*-linux"]} {
     set target_cflags "-D_MIT_POSIX_THREADS"
 } else {
     set target_cflags ""
@@ -79,7 +79,7 @@ proc all_threads_running {} {
        }
     }
 
-    if { $return_me == 1 } then {
+    if {$return_me == 1} {
        return 0
     }
 
@@ -139,7 +139,7 @@ proc test_startup {} {
        }
     }
 
-    if { $return_me == 1 } then {
+    if {$return_me == 1} {
        return 0
     }
 
@@ -189,7 +189,7 @@ proc check_control_c {} {
 
     # Verify that all threads are running.
     with_test_prefix "after startup" {
-       if [all_threads_running] then {
+       if {[all_threads_running]} {
            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.
     with_test_prefix "after continue" {
-       if [all_threads_running] then {
+       if {[all_threads_running]} {
            pass "all threads running after continuing from ^C stop"
        }
     }
@@ -345,9 +345,9 @@ proc check_qcs {} {
 
 }
 
-if [runto_main] then {
-    if [test_startup] then {
-       if [check_control_c] then {
+if {[runto_main]} {
+    if {[test_startup]} {
+       if {[check_control_c]} {
            warning "Could not stop child with ^C; skipping rest of tests.\n"
            return
        }

diff --git a/gdb/testsuite/gdb.threads/reconnect-signal.exp b/gdb/testsuite/gdb.threads/reconnect-signal.exp
index 4b90c92ecbf889fe71f0a259252f8cdfab72b1d4..3edaa31b7d366c60c3c1ed5dc947119579b3ff86 100644 (file)
--- a/gdb/testsuite/gdb.threads/reconnect-signal.exp
+++ b/gdb/testsuite/gdb.threads/reconnect-signal.exp
@@ -33,7 +33,7 @@ if { [gdb_compile_pthreads \
 
 clean_restart $executable
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
index e18d12d7394fc021022846c089b001ca024ebe3d..47a6fc3d2c45e24e1d3be3a3cab5267c6db81643 100644 (file)
--- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp
@@ -40,7 +40,7 @@ proc test { step_over } {
     with_test_prefix "step-over $step_over" {
        clean_restart ${binfile}
 
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
 

diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
index ba7bb26178c1be16c9153038015743d8fc53adb9..6c56377c461d8c78f442a7d441f9313a10ee8aa0 100644 (file)
--- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
+++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp
@@ -37,7 +37,7 @@ proc test { schedlock } {
     with_test_prefix "schedlock $schedlock" {
        clean_restart ${binfile}
 
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
 

diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
index 4e9d9ee60173d08ec8d02e402451652f951a37e0..e041ffafa4cfc6d6d698151e1565da45a7cd0173 100644 (file)
--- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
+++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp
@@ -34,7 +34,7 @@ proc test { command } {
     with_test_prefix "$command" {
        clean_restart ${binfile}
 
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
 

diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
index 1866ab9dd076a8f52c1ed79e4ca1af4de03e9520..7aba001d4f6e8029997aa022febe5c6bb4bec9f1 100644 (file)
--- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp
+++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp
@@ -37,7 +37,7 @@ proc test { sigtrap_thread } {
     with_test_prefix "sigtrap thread $sigtrap_thread" {
        clean_restart ${binfile}
 
-       if ![runto "thread_function"] then {
+       if {![runto "thread_function"]} {
            return 0
        }
 

diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
index 8e068cd9516b2fae466a2c2d02f314bbd64d7c69..d650b872f2d1a8ba1b810a8ee8ea9ee6adc2c9ff 100644 (file)
--- a/gdb/testsuite/gdb.threads/sigthread.exp
+++ b/gdb/testsuite/gdb.threads/sigthread.exp
@@ -23,7 +23,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/stop-with-handle.exp b/gdb/testsuite/gdb.threads/stop-with-handle.exp
index fccafd8acbf5b6759c0d1b1d486e4c6e9c144e6a..b3336c2c60946ca56be0f15306f480e3668cad0a 100644 (file)
--- a/gdb/testsuite/gdb.threads/stop-with-handle.exp
+++ b/gdb/testsuite/gdb.threads/stop-with-handle.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/thread-find.exp b/gdb/testsuite/gdb.threads/thread-find.exp
index fb23df10b8850ebfd687fe7a6e6633f57944562f..f60caff74ddeacdc405d4477bc9cfa71e5ef48ee 100644 (file)
--- a/gdb/testsuite/gdb.threads/thread-find.exp
+++ b/gdb/testsuite/gdb.threads/thread-find.exp
@@ -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"
 }
 
@@ -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"
 }
 
@@ -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"
 }
 
@@ -126,7 +126,7 @@ gdb_test "thread find threadname_1" \
 # Test 'thread find' with thread ids, if any.
 #
 
-if { [info exists thread6] } then {
+if {[info exists thread6]} {
     gdb_test "thread find $thread6" \
        "Thread 6 has .*$thread6.*" "find thread id 6"
     gdb_test "thread find $thread5" \
@@ -145,7 +145,7 @@ if { [info exists thread6] } then {
 # Test 'thread find' with process ids, if any.
 #
 
-if { [info exists process6] } then {
+if {[info exists process6]} {
     gdb_test "thread find $process6" \
        "Thread 6 has .*$process6.*" "find process id 6"
     gdb_test "thread find $process5" \
@@ -164,7 +164,7 @@ if { [info exists process6] } then {
 # Test 'thread find' with lwp ids, if any.
 #
 
-if { [info exists lwp6] } then {
+if {[info exists lwp6]} {
     gdb_test "thread find $lwp6" \
        "Thread 6 has .*$lwp6.*" "find lwp id 6"
     gdb_test "thread find $lwp5" \
@@ -197,7 +197,7 @@ gdb_test_multiple "thread find threadname_\[345\]" "test regular exp" {
        exp_continue
     }
     -re ".*$gdb_prompt $" {
-       if { $see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6 } then {
+       if {$see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6} {
            pass "test regular exp"
        } else {
            fail "test regular exp"
@@ -219,7 +219,7 @@ gdb_test_multiple "info threads 2 4 6" "info threads 2 4 6" {
        exp_continue
     }
     -re "$gdb_prompt $" {
-       if { $see2 && $see4 && $see6 && !$see1 && !$see3 && !$see5 } then {
+       if {$see2 && $see4 && $see6 && !$see1 && !$see3 && !$see5} {
            pass "info threads 2 4 6"
        } else {
            fail "info threads 2 4 6"
@@ -241,7 +241,7 @@ gdb_test_multiple "info threads 3-5" "info threads 3-5" {
        exp_continue
     }
     -re "$gdb_prompt $" {
-       if { $see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6 } then {
+       if {$see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6} {
            pass "info threads 3-5"
        } else {
            fail "info threads 3-5"
@@ -265,7 +265,7 @@ gdb_test_multiple "info threads 3-3" "info threads 3-3" {
        exp_continue
     }
     -re ".*$gdb_prompt $" {
-       if { $see3 && !$see1 && !$see2 && !$see4 && !$see5 && !$see6 } then {
+       if {$see3 && !$see1 && !$see2 && !$see4 && !$see5 && !$see6} {
            pass "info threads 3-3"
        } else {
            fail "info threads 3-3"

diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 61ec078a85a1144cd1826c27c5c75554e1a9717d..03431fd56a4fa7e3072c477eb7b7b0bef8df8cfb 100644 (file)
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -41,7 +41,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
       return 1
 }
 

diff --git a/gdb/testsuite/gdb.threads/thread_events.exp b/gdb/testsuite/gdb.threads/thread_events.exp
index a612d2233969224ec5809df492a27ee7118d5159..6cd935a39a1a2558e76afda2cc6b86abfdde763b 100644 (file)
--- a/gdb/testsuite/gdb.threads/thread_events.exp
+++ b/gdb/testsuite/gdb.threads/thread_events.exp
@@ -23,7 +23,7 @@
 
 # This test has only been verified with Linux targets, and would need
 # to be generalized to support other targets
-if ![istarget *-*-linux*] then {
+if {![istarget *-*-linux*]} {
     return
 }
 
@@ -112,7 +112,7 @@ proc test_thread_messages {enabled} {
 
   # The initial thread may log a 'New Thread' message, but we don't
   # check for it.
-  if ![runto_main] then {
+  if {![runto_main]} {
      return 1
   }
 

diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
index c8b73d13400e92a5b53da091a89f550c4e4e3ee5..8302773ec1363601577edc0267ded9c1139e9c28 100644 (file)
--- a/gdb/testsuite/gdb.threads/threadapply.exp
+++ b/gdb/testsuite/gdb.threads/threadapply.exp
@@ -31,7 +31,7 @@ clean_restart ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
index 88cabac71c8365acbd3997293e03d255aeeb61d2..5873796ad322105b0cf553d662a3af44a0d627b4 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug-pie.exp
@@ -21,7 +21,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 }
 
 clean_restart ${binfile}
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/tls-nodebug.exp b/gdb/testsuite/gdb.threads/tls-nodebug.exp
index 6b8023a91b9b3462bf81e1a72843768ff4cc3ef4..00e539b7d146f87457c1f660114b04c6615d3a9d 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls-nodebug.exp
+++ b/gdb/testsuite/gdb.threads/tls-nodebug.exp
@@ -16,7 +16,7 @@
 
 standard_testfile
 
-if [istarget "*-*-linux"] then {
+if {[istarget "*-*-linux"]} {
     set target_cflags "-D_MIT_POSIX_THREADS"
 } else {
     set target_cflags ""
@@ -27,7 +27,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab
 }
 
 clean_restart ${binfile}
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
index cff80f86049712b24f59f6939bed4f8808274240..8f0f9ec62fd5a44b02cffc4c0f6759d371457ad2 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls-shared.exp
+++ b/gdb/testsuite/gdb.threads/tls-shared.exp
@@ -32,7 +32,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
 clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/tls-so_extern.exp b/gdb/testsuite/gdb.threads/tls-so_extern.exp
index e6783175904c79802de2ad28301f79ff6b183aed..b885c0beacacdd55df66a5f71da957b71bdf6c6a 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls-so_extern.exp
+++ b/gdb/testsuite/gdb.threads/tls-so_extern.exp
@@ -31,7 +31,7 @@ if { [gdb_compile_shlib_pthreads ${srcdir}/${subdir}/${srcfile_lib} ${binfile_li
 clean_restart ${binfile}
 gdb_load_shlib ${binfile_lib}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 4f88c0ec987fc55fa32ddc964dc36af507b11c66..f041571926db02e544bcf54d6187e053b5ce7bcc 100644 (file)
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -18,7 +18,7 @@ load_lib gdb-python.exp
 
 standard_testfile tls.c tls2.c
 
-if [istarget "*-*-linux"] then {
+if {[istarget "*-*-linux"]} {
     set target_cflags "-D_MIT_POSIX_THREADS"
 } else {
     set target_cflags ""
@@ -167,7 +167,7 @@ gdb_test_multiple "print a_thread_local" "" {
     }
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
index c679857cb6bac5beb0b7b8dbe6b26c1fc27d9125..0398e22664121edd6f27c186ec4cdadd2cb2cbd6 100644 (file)
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exec.exp
@@ -30,7 +30,7 @@ proc test_vfork {detach} {
 
     clean_restart $binfile
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
index aff4ad241fa9bbc0c222dc00036b253c1dee0dd0..0bff3aff697e5245ceca1308a3a36869448bf316 100644 (file)
--- a/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
+++ b/gdb/testsuite/gdb.threads/vfork-follow-child-exit.exp
@@ -30,7 +30,7 @@ proc test_vfork {detach} {
 
     clean_restart $binfile
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index 7003044a177f22cd6975544daa78f7b4e751f6ce..7fac8a3df80f188c98191dd664b35baee0bfe81a 100644 (file)
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -44,7 +44,7 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp
index 2c18b20257c1830ed3f44e508581aaa2567b6786..8b887f2a9445e3df974718c9ace07188a6896270 100644 (file)
--- a/gdb/testsuite/gdb.threads/watchthreads2.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads2.exp
@@ -41,7 +41,7 @@ gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp
index d1c5b9df2d51e28039300a4c6647362a88afc0c0..bec3d10fd67839cf143a6252661906a7b0354ca8 100644 (file)
--- a/gdb/testsuite/gdb.threads/wp-replication.exp
+++ b/gdb/testsuite/gdb.threads/wp-replication.exp
@@ -42,7 +42,7 @@ clean_restart ${binfile}
 gdb_test_no_output "set can-use-hw-watchpoints 1" ""
 
 # Run to `main' where we begin our tests.
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }