From: Andrew Burgess <aburgess@redhat.com>
Date: Mon, 14 Nov 2022 11:39:14 +0000 (+0000)
Subject: gdb/testsuite: remove use of then keyword from gdb.arch/*.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=75b6f3866450afa1219ca986910619302f7effb7;p=binutils-gdb.git

gdb/testsuite: remove use of then keyword from gdb.arch/*.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.arch/
test script directory.

There should be no changes in what is tested after this commit.
---

diff --git a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
index 105b9a9cc3a..a6d549a9830 100644
--- a/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
+++ b/gdb/testsuite/gdb.arch/aarch64-unwind-pc.exp
@@ -17,7 +17,7 @@
 
 # Test explicitly unwinding the PC DWARF register on aarch64
 
-if {![is_aarch64_target]} then {
+if {![is_aarch64_target]} {
     verbose "Skipping ${gdb_test_file_name}."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
index b65ed8124b9..2f046752c63 100644
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ b/gdb/testsuite/gdb.arch/alpha-step.exp
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-if ![istarget "alpha*-*-*"] then {
+if {![istarget "alpha*-*-*"]} {
     verbose "Skipping alpha step tests."
     return
 }
@@ -37,7 +37,7 @@ proc test_stepi {function } {
     # Restart the program from scratch. If GDB got confused during one
     # of the previous tests, this makes sure that it doesn't affect
     # this series of tests.
-    if ![runto_main] then {
+    if {![runto_main]} {
         return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
index d46882ad7ac..d32cac71699 100644
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ b/gdb/testsuite/gdb.arch/altivec-abi.exp
@@ -21,7 +21,7 @@
 # This file uses altivec-abi.c for input.
 #
 
-if {![istarget "powerpc*"] || [skip_altivec_tests]} then {
+if {![istarget "powerpc*"] || [skip_altivec_tests]} {
     verbose "Skipping altivec abi tests."
     return
 }
@@ -56,7 +56,7 @@ proc altivec_abi_tests { extra_flags force_abi } {
     gdb_load ${binfile}
 
     # Run to `main' where we begin our tests.
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
index 42521a0a9ab..43ef5ed25c8 100644
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ b/gdb/testsuite/gdb.arch/altivec-regs.exp
@@ -22,7 +22,7 @@
 #
 
 
-if {![istarget "powerpc*"] || [skip_altivec_tests]} then {
+if {![istarget "powerpc*"] || [skip_altivec_tests]} {
     verbose "Skipping altivec register tests."
     return
 }
@@ -52,7 +52,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-byte.exp b/gdb/testsuite/gdb.arch/amd64-byte.exp
index 085963230cc..8ab7b68bf6b 100644
--- a/gdb/testsuite/gdb.arch/amd64-byte.exp
+++ b/gdb/testsuite/gdb.arch/amd64-byte.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
index a64c85bc0e9..1d79f274f73 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step-avx.exp
@@ -42,7 +42,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] }
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-disp-step.exp b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
index 7bd2d5fac51..eb303af1b09 100644
--- a/gdb/testsuite/gdb.arch/amd64-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/amd64-disp-step.exp
@@ -35,7 +35,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile $opts] } {
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-dword.exp b/gdb/testsuite/gdb.arch/amd64-dword.exp
index 0c297529dc0..5151a60da4a 100644
--- a/gdb/testsuite/gdb.arch/amd64-dword.exp
+++ b/gdb/testsuite/gdb.arch/amd64-dword.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-gs_base.exp b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
index 477e78eb842..f0a1013f2b2 100644
--- a/gdb/testsuite/gdb.arch/amd64-gs_base.exp
+++ b/gdb/testsuite/gdb.arch/amd64-gs_base.exp
@@ -15,7 +15,7 @@
 
 standard_testfile
 
-if { ![is_amd64_regs_target] } then {
+if {![is_amd64_regs_target]} {
     verbose "Untested x86_64 fs_base and gs_base tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
index fdc633042b4..6a99afb4725 100644
--- a/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
+++ b/gdb/testsuite/gdb.arch/amd64-init-x87-values.exp
@@ -18,7 +18,7 @@
 # Test initial values of x87 control registers, before any x87
 # instructions have been executed in the inferior.
 
-if ![is_amd64_regs_target] then {
+if {![is_amd64_regs_target]} {
     return
 }
 
@@ -45,7 +45,7 @@ proc_with_prefix check_x87_regs_around_init {} {
     clean_restart ${binfile}
 
     # Get things started.
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return 0
     }
 
@@ -119,7 +119,7 @@ proc_with_prefix check_setting_mxcsr_before_enable {} {
 
     clean_restart ${binfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return 0
     }
 
@@ -153,7 +153,7 @@ proc_with_prefix check_setting_x87_regs_before_enable {} {
 
     clean_restart ${binfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/amd64-word.exp b/gdb/testsuite/gdb.arch/amd64-word.exp
index c518dc96c86..51eac6620a1 100644
--- a/gdb/testsuite/gdb.arch/amd64-word.exp
+++ b/gdb/testsuite/gdb.arch/amd64-word.exp
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
index c7f2dfd9a39..cf50bd9e3e6 100644
--- a/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
+++ b/gdb/testsuite/gdb.arch/arc-analyze-prologue.exp
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if {![istarget "arc*-*-*"]} then {
+if {![istarget "arc*-*-*"]} {
     verbose "Skipping ARC prologue test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/arc-decode-insn.exp b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
index 5564373a49a..182132bab82 100644
--- a/gdb/testsuite/gdb.arch/arc-decode-insn.exp
+++ b/gdb/testsuite/gdb.arch/arc-decode-insn.exp
@@ -31,7 +31,7 @@
 # about requirements to actual test cases can be found in corresponding
 # assembly file of this test case (arc-decode-insn.S).
 
-if {![istarget "arc*-*-*"]} then {
+if {![istarget "arc*-*-*"]} {
     verbose "Skipping ARC decoder test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
index 86f4acad656..167359a0119 100644
--- a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
@@ -15,7 +15,7 @@
 
 # Test ARC disassembler options.
 
-if { ![istarget "arc-*-*"] } then {
+if {![istarget "arc-*-*"]} {
     verbose "Skipping ARC disassembler option test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
index 4e84ff9d4a7..e562112badd 100644
--- a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp
@@ -18,7 +18,7 @@
 # This test exercises set/show disassembler-options results are preserved
 # across multiple set architecture calls.
 
-if {![istarget "arm*-*-*"]} then {
+if {![istarget "arm*-*-*"]} {
     verbose "Skipping ARM disassembler options."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/arm-disp-step.exp b/gdb/testsuite/gdb.arch/arm-disp-step.exp
index e60ef7b1120..ec6578257b3 100644
--- a/gdb/testsuite/gdb.arch/arm-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/arm-disp-step.exp
@@ -17,7 +17,7 @@
 
 # Test arm displaced stepping.
 
-if {![is_aarch32_target]} then {
+if {![is_aarch32_target]} {
     verbose "Skipping arm displaced stepping tests."
     return
 }
@@ -409,7 +409,7 @@ proc test_add_rn_pc {} {
 # which is in library might be compiled in Thumb.
 gdb_test_no_output "set displaced-stepping off"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
index cb5e46a68db..0a94d4346bc 100644
--- a/gdb/testsuite/gdb.arch/e500-abi.exp
+++ b/gdb/testsuite/gdb.arch/e500-abi.exp
@@ -22,7 +22,7 @@
 #
 
 
-if ![istarget "powerpc-*eabispe"] then {
+if {![istarget "powerpc-*eabispe"]} {
     verbose "Skipping e500 abi tests."
     return
 }
@@ -45,7 +45,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.exp b/gdb/testsuite/gdb.arch/e500-prologue.exp
index 2887a83f23e..94b4a960e8e 100644
--- a/gdb/testsuite/gdb.arch/e500-prologue.exp
+++ b/gdb/testsuite/gdb.arch/e500-prologue.exp
@@ -18,7 +18,7 @@
 # Test PowerPC E500 prologue analyzer.
 
 
-if ![istarget "powerpc-*"] then {
+if {![istarget "powerpc-*"]} {
     verbose "Skipping powerpc E500 prologue tests."
     return
 }
@@ -62,7 +62,7 @@ proc insert_breakpoint {function expected_location} {
     # instruction at that address (we're not interested in the insn
     # itself, but rather at the address printed at the begining of
     # the instruction).
-    if { $address != "" } then {
+    if {$address != ""} {
        gdb_test "x /i $address" \
                 ".*<$function\\+$expected_location>.*" \
                 "check $function breakpoint address"
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
index 254246d1a65..d5fd7656937 100644
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ b/gdb/testsuite/gdb.arch/e500-regs.exp
@@ -22,7 +22,7 @@
 #
 
 
-if ![istarget "powerpc-*eabispe"] then {
+if {![istarget "powerpc-*eabispe"]} {
     verbose "Skipping e500 register tests."
     return
 }
@@ -44,7 +44,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -144,7 +144,7 @@ gdb_exit
 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.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index cc60ebfc3a1..47487513a6e 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -24,7 +24,7 @@
 # Test SH backtraces with >256 byte frame stack. (PR:1291)
 
 
-if ![istarget "sh-*-*"] then {
+if {![istarget "sh-*-*"]} {
     verbose "Skipping SH backtrace tests."
     return
 }
@@ -46,7 +46,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index 78ff651df73..d4585b38a39 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -26,7 +26,7 @@
 # Observe that the until command doesn't go all the way to sub2.
 
 
-if ![istarget "sh-*-*"] then {
+if {![istarget "sh-*-*"]} {
     verbose "Skipping SH backtrace tests."
     return
 }
@@ -48,7 +48,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index 13f92ddf601..a1094e221b2 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -22,7 +22,7 @@
 # from main.
 
 
-if ![istarget "sh-*-*"] then {
+if {![istarget "sh-*-*"]} {
     verbose "Skipping SH breakpoint test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp
index 950b411809e..2a2c17115e7 100644
--- a/gdb/testsuite/gdb.arch/i386-avx.exp
+++ b/gdb/testsuite/gdb.arch/i386-avx.exp
@@ -48,7 +48,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -100,7 +100,7 @@ with_test_prefix "force-disable xml descriptions" {
 	    clean_restart ${binfile}
 	}
 
-	if ![runto_main] then {
+	if {![runto_main]} {
 	    return
 	}
 
diff --git a/gdb/testsuite/gdb.arch/i386-biarch-core.exp b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
index 95e60d0b552..bb1678a36d3 100644
--- a/gdb/testsuite/gdb.arch/i386-biarch-core.exp
+++ b/gdb/testsuite/gdb.arch/i386-biarch-core.exp
@@ -21,7 +21,7 @@
 # #define EM_X86_64       62              /* AMD x86-64 architecture */
 # patch @0x12: 0x3E -> 0x03
 
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     verbose "Skipping i386 biarch core test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
index f45871c4b58..975c3559af8 100644
--- a/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
+++ b/gdb/testsuite/gdb.arch/i386-bp_permanent.exp
@@ -18,7 +18,7 @@
 
 # Test stepping over permanent breakpoints on i386.
 
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     verbose "Skipping skip over permanent breakpoint on i386 tests."
     return
 }
@@ -45,7 +45,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-byte.exp b/gdb/testsuite/gdb.arch/i386-byte.exp
index f29d54ec1bc..e6564f73162 100644
--- a/gdb/testsuite/gdb.arch/i386-byte.exp
+++ b/gdb/testsuite/gdb.arch/i386-byte.exp
@@ -19,7 +19,7 @@
 # This file is part of the gdb testsuite.
 
 
-if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"])} then {
+if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"])} {
     verbose "Skipping i386 byte register tests."
     return
 }
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-disp-step.exp b/gdb/testsuite/gdb.arch/i386-disp-step.exp
index c02b31f8b9a..dba61a67736 100644
--- a/gdb/testsuite/gdb.arch/i386-disp-step.exp
+++ b/gdb/testsuite/gdb.arch/i386-disp-step.exp
@@ -18,7 +18,7 @@
 # Test i386 displaced stepping.
 
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping x86 displaced stepping tests."
     return
 }
@@ -32,7 +32,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
 gdb_test "set displaced-stepping on" ""
 gdb_test "show displaced-stepping" ".* displaced stepping .* is on.*"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
index bab118b0ea0..305cfea5e68 100644
--- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
+++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp
@@ -19,7 +19,7 @@
 # This test relies on being able to set 4 hardware watchpoints.  Since
 # that is not a valid assumption across most targets, and we're
 # testing a x86 specific bug, skip everywhere else.
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     return 0
 }
 
@@ -29,7 +29,7 @@ if [prepare_for_testing "failed to prepare" ${binfile} ${srcfile} {debug $additi
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-float.exp b/gdb/testsuite/gdb.arch/i386-float.exp
index 033c0eac900..69f673534d4 100644
--- a/gdb/testsuite/gdb.arch/i386-float.exp
+++ b/gdb/testsuite/gdb.arch/i386-float.exp
@@ -18,7 +18,7 @@
 
 # Test the x87 floating point information printout.
 
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     verbose "Skipping i386 tests for x87 floating point support."
     return
 }
@@ -32,7 +32,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile [list debug nop
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index 68aae8f9236..04f80acf44a 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -23,7 +23,7 @@
 # Test i386 unwinder.
 
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping i386 unwinder tests."
     return
 }
@@ -86,7 +86,7 @@ gdb_test "frame $gate_n" \
 gdb_test_multiple "info frame" "existence of the CFI inserted register" {
     -re "Stack level $gate_n, frame at (0x\[0-9a-f\]+):.*Saved registers:.* ecx at (0x\[0-9a-f\]+),.*" {
 	pass "existence of the CFI inserted register"
-	if { [string compare $expect_out(1,string) $expect_out(2,string)] } then {
+	if {[string compare $expect_out(1,string) $expect_out(2,string)]} {
 	    fail "value of the CFI inserted register"
 	} else {
 	    pass "value of the CFI inserted register"
diff --git a/gdb/testsuite/gdb.arch/i386-permbkpt.exp b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
index 48b6b1574a5..3e8c6b52acc 100644
--- a/gdb/testsuite/gdb.arch/i386-permbkpt.exp
+++ b/gdb/testsuite/gdb.arch/i386-permbkpt.exp
@@ -18,7 +18,7 @@
 
 # Test inserting breakpoints over permanent breakpoints on i386 and amd64.
 
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     verbose "Skipping i386 test for multi break at permanent breakpoint location."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index 9cfd7e5ccc5..1988e0b7b85 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -21,7 +21,7 @@
 # Test i386 prologue analyzer.
 
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping i386 prologue tests."
     return
 }
@@ -65,7 +65,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-signal.exp b/gdb/testsuite/gdb.arch/i386-signal.exp
index 7e8f62350a3..d7677c8bb01 100644
--- a/gdb/testsuite/gdb.arch/i386-signal.exp
+++ b/gdb/testsuite/gdb.arch/i386-signal.exp
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if { ![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"] } then {
+if {![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]} {
     verbose "Skipping i386 unwinder tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
index e7ea47e4aca..ecdbb0a8e11 100644
--- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp
+++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
@@ -17,7 +17,7 @@
 
 # Test that GDB can handle overlapping sizes of symbols.
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping i386 unwinder tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index 4fdd3305c4b..19c5552631a 100644
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -20,7 +20,7 @@
 
 # Test that GDB can see the sizes of symbols.
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping i386 unwinder tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index c66a352a9d1..e4699fe511b 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -37,7 +37,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts
 
 clean_restart $executable
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index 6565f15aa76..2f94fc4521d 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -43,7 +43,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 66f30bcb8c4..f9f0307674f 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -21,7 +21,7 @@
 # Test i386 unwinder.
 
 
-if { ![is_x86_like_target] } then {
+if {![is_x86_like_target]} {
     verbose "Skipping i386 unwinder tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/i386-word.exp b/gdb/testsuite/gdb.arch/i386-word.exp
index 5ad01eb20f1..16d7dbfcc53 100644
--- a/gdb/testsuite/gdb.arch/i386-word.exp
+++ b/gdb/testsuite/gdb.arch/i386-word.exp
@@ -19,7 +19,7 @@
 # This file is part of the gdb testsuite.
 
 
-if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"])} then {
+if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"])} {
     verbose "Skipping i386 word register tests."
     return
 }
@@ -33,7 +33,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list
 
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
index 1e96937f679..1d8be6e7066 100644
--- a/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
+++ b/gdb/testsuite/gdb.arch/iwmmxt-regs.exp
@@ -16,7 +16,7 @@
 
 # Tests for ARM iWMMXt register setting and fetching.
 
-if ![istarget "arm*-*-*"] then {
+if {![istarget "arm*-*-*"]} {
     verbose "Skipping iWMMXt register tests."
     return
 }
@@ -40,7 +40,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/mips-disassembler-options.exp b/gdb/testsuite/gdb.arch/mips-disassembler-options.exp
index fd363b727de..97a2d5b4f66 100644
--- a/gdb/testsuite/gdb.arch/mips-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/mips-disassembler-options.exp
@@ -15,7 +15,7 @@
 
 # Test MIPS disassembler options.
 
-if { ![istarget "mips*-*-*"] } then {
+if {![istarget "mips*-*-*"]} {
     verbose "Skipping MIPS disassembler option tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/mips-fcr.exp b/gdb/testsuite/gdb.arch/mips-fcr.exp
index 294e6f0c34d..77b48bfe181 100644
--- a/gdb/testsuite/gdb.arch/mips-fcr.exp
+++ b/gdb/testsuite/gdb.arch/mips-fcr.exp
@@ -17,7 +17,7 @@
 
 # Test MIPS Floating Point Control Register handling.
 
-if { ![istarget "mips*-*-*"] } then {
+if {![istarget "mips*-*-*"]} {
     verbose "Skipping MIPS Floating Point Control Register tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/mips-fpregset-core.exp b/gdb/testsuite/gdb.arch/mips-fpregset-core.exp
index 059c227aab8..bbfa1b5e6c1 100644
--- a/gdb/testsuite/gdb.arch/mips-fpregset-core.exp
+++ b/gdb/testsuite/gdb.arch/mips-fpregset-core.exp
@@ -15,7 +15,7 @@
 
 # Test MIPS Floating Point General Register handling in core files.
 
-if { ![istarget "mips*-*-*"] } then {
+if {![istarget "mips*-*-*"]} {
     verbose "Skipping MIPS Floating Point General Register tests."
     return
 }
@@ -133,7 +133,7 @@ proc mips_fpregset_core_test { supported corefile } {
 	set test "core file FGR register contents"
 	set core_fgr_contents \
 	    [mips_fpregset_core_fetch_float_registers "retrieve $test"]
-	if { $core_fgr_contents == $live_fgr_contents } then {
+	if {$core_fgr_contents == $live_fgr_contents} {
 	    pass $test
 	} else {
 	    fail $test
diff --git a/gdb/testsuite/gdb.arch/mips16-thunks.exp b/gdb/testsuite/gdb.arch/mips16-thunks.exp
index 00ebeecb507..d0b9038544a 100644
--- a/gdb/testsuite/gdb.arch/mips16-thunks.exp
+++ b/gdb/testsuite/gdb.arch/mips16-thunks.exp
@@ -25,7 +25,7 @@
 # toolchain for a subset of ABIs, so we need to check that a MIPS16
 # executable can be built and run at all before we attempt the actual test.
 
-if { ![istarget "mips*-*-*"] } then {
+if {![istarget "mips*-*-*"]} {
     verbose "Skipping MIPS16 thunk support tests."
     return
 }
@@ -37,7 +37,7 @@ proc set_src_and_obj { filename { suffix "" } } {
     global srcdir
     global subdir
 
-    if ![string equal "$suffix" ""] then {
+    if {![string equal "$suffix" ""]} {
 	set suffix "-$suffix"
     }
     set srcfile ${srcdir}/${subdir}/${filename}.c
@@ -61,7 +61,7 @@ gdb_compile ${srcfile} ${objfile} object ${options}
 
 set binfile [standard_output_file ${testname}]
 set options [list debug nowarnings]
-if { [gdb_compile ${objfiles} ${binfile} executable ${options}] != "" } then {
+if {[gdb_compile ${objfiles} ${binfile} executable ${options}] != ""} {
     unsupported "no MIPS16 support in the toolchain."
     return
 }
@@ -116,7 +116,7 @@ gdb_compile ${srcfile} ${objfile} object ${options}
 
 set binfile [standard_output_file ${testname}]
 set options [list debug nowarnings additional_flags=-fPIC]
-if { [gdb_compile ${objfiles} ${binfile} executable ${options}] == "" } then {
+if {[gdb_compile ${objfiles} ${binfile} executable ${options}] == ""} {
     clean_restart ${testname}
     gdb_breakpoint inmain
     gdb_run_cmd
@@ -189,7 +189,7 @@ set binfile [standard_output_file ${testname}]
 set options [list debug nowarnings]
 gdb_compile ${objfiles} ${binfile} executable ${options}
 clean_restart ${testname}
-if ![runto_main] then {
+if {![runto_main]} {
     return
 }
 
@@ -291,7 +291,7 @@ proc finish_through { id funcs } {
 
 # Report PASS if VAL is equal to EXP, otherwise report FAIL, using MSG.
 proc pass_if_eq { val exp msg } {
-    if [string equal "$val" "$exp"] then {
+    if {[string equal "$val" "$exp"]} {
 	pass "$msg"
     } else {
 	fail "$msg"
@@ -304,7 +304,7 @@ proc pass_if_eq { val exp msg } {
 # for the same function.  If successful, then return the name of the
 # function we have stopped in.
 proc finish_if_ne { id func want funcs } {
-    if ![string equal "$func" "$want"] then {
+    if {![string equal "$func" "$want"]} {
 	set call "$func"
 	set want [lindex $funcs 0]
 	set func [finish_through "$id" [linsert $funcs 0 "$func"]]
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
index bb00f57249b..2c30f06224b 100644
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ b/gdb/testsuite/gdb.arch/pa-nullify.exp
@@ -88,7 +88,7 @@ proc get_addr_of_sym { sym } {
   return $addr
 }
 
-if  ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -124,7 +124,7 @@ proc test_core_bt { test } {
 }
 
 set test "core at last insn in foo"
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 gdb_breakpoint "*$foo_last"
@@ -134,7 +134,7 @@ if [gen_core $test] {
 }
 
 set test "core at nullified insn"
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 gdb_breakpoint "*$foo_last"
diff --git a/gdb/testsuite/gdb.arch/powerpc-addpcis.exp b/gdb/testsuite/gdb.arch/powerpc-addpcis.exp
index 12b2141cdb0..e7eecf4ffa5 100644
--- a/gdb/testsuite/gdb.arch/powerpc-addpcis.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-addpcis.exp
@@ -38,7 +38,7 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
       return
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
index a85891bab9f..bd959bb056b 100644
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
@@ -18,7 +18,7 @@
 # Test rs6000 prologue analyzer.
 
 
-if ![istarget "powerpc-*-aix*"] then {
+if {![istarget "powerpc-*-aix*"]} {
     verbose "Skipping powerpc-aix prologue tests."
     return
 }
@@ -62,7 +62,7 @@ proc insert_breakpoint {function expected_location} {
     # instruction at that address (we're not interested in the insn
     # itself, but rather at the address printed at the begining of
     # the instruction).
-    if { $address != "" } then {
+    if {$address != ""} {
        gdb_test "x /i $address" \
                 ".*<$function\\+$expected_location>.*" \
                 "check $function breakpoint address"
diff --git a/gdb/testsuite/gdb.arch/powerpc-altivec.exp b/gdb/testsuite/gdb.arch/powerpc-altivec.exp
index 93c6d8cd960..20f4d07ce19 100644
--- a/gdb/testsuite/gdb.arch/powerpc-altivec.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-altivec.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-altivec2.exp b/gdb/testsuite/gdb.arch/powerpc-altivec2.exp
index 7efc4fb750d..05edfbd8573 100644
--- a/gdb/testsuite/gdb.arch/powerpc-altivec2.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-altivec2.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-altivec3.exp b/gdb/testsuite/gdb.arch/powerpc-altivec3.exp
index a2d481b0c2f..dc36c5fc456 100644
--- a/gdb/testsuite/gdb.arch/powerpc-altivec3.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-altivec3.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
index 6e7bb675c8d..5c2c556d113 100644
--- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp
@@ -20,7 +20,7 @@
 
 # Testcase for ppc decimal128 pseudo-registers.
 
-if ![istarget "powerpc64*-*"] then {
+if {![istarget "powerpc64*-*"]} {
     verbose "Skipping powerpc Decimal128 pseudo-registers testcase."
     return
 }
@@ -39,7 +39,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-if { ![runto_main] } then {
+if {![runto_main]} {
    return
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
index beea9cff247..3c096b012b9 100644
--- a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp
@@ -18,7 +18,7 @@
 # This test exercises set/show disassembler-options results are preserved
 # across multiple set architecture calls.
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC disassembler options."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
index 4703bc65adb..30032ee5f8c 100644
--- a/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-fpscr-gcore.exp
@@ -18,7 +18,7 @@
 # This tests checks that generating and loading a core file preserves
 # the correct FPSCR size.
 
-if {![istarget "powerpc*-*-linux*"]} then {
+if {![istarget "powerpc*-*-linux*"]} {
     verbose "Skipping PowerPC test for corefiles with FPSCR."
     return
 }
@@ -39,7 +39,7 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
 
 clean_restart $binfile
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-htm-regs.exp b/gdb/testsuite/gdb.arch/powerpc-htm-regs.exp
index ff49e1dd83a..236e88065e2 100644
--- a/gdb/testsuite/gdb.arch/powerpc-htm-regs.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-htm-regs.exp
@@ -25,7 +25,7 @@
 # registers are then checked against the saved values, because the
 # abort should have reverted the registers to these values.
 
-if {![istarget "powerpc*-*-linux*"]} then {
+if {![istarget "powerpc*-*-linux*"]} {
     verbose "Skipping PowerPC test for HTM registers."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-lnia.exp b/gdb/testsuite/gdb.arch/powerpc-lnia.exp
index e680a531d5f..f2beca1f15d 100644
--- a/gdb/testsuite/gdb.arch/powerpc-lnia.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-lnia.exp
@@ -37,7 +37,7 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
       return
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp
index 8a79e810fbd..d5a1671a9e4 100644
--- a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp
@@ -33,7 +33,7 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
 gdb_test "set radix 0b10000"
 gdb_test "set debug displaced"
 
-if ![runto_main] then {
+if {![runto_main]} {
       return
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-power10.exp b/gdb/testsuite/gdb.arch/powerpc-power10.exp
index b9383d8bd2a..10cd3942bbf 100644
--- a/gdb/testsuite/gdb.arch/powerpc-power10.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-power10.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-power7.exp b/gdb/testsuite/gdb.arch/powerpc-power7.exp
index 10f7eebefc9..3e4b51a89cf 100644
--- a/gdb/testsuite/gdb.arch/powerpc-power7.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-power7.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-power8.exp b/gdb/testsuite/gdb.arch/powerpc-power8.exp
index cb0b3eb5233..7cb6ca1a126 100644
--- a/gdb/testsuite/gdb.arch/powerpc-power8.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-power8.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-power9.exp b/gdb/testsuite/gdb.arch/powerpc-power9.exp
index b43cd3baf37..1a44e5520c9 100644
--- a/gdb/testsuite/gdb.arch/powerpc-power9.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-power9.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-ppr-dscr.exp b/gdb/testsuite/gdb.arch/powerpc-ppr-dscr.exp
index a2d5a171f48..5d4581b3550 100644
--- a/gdb/testsuite/gdb.arch/powerpc-ppr-dscr.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-ppr-dscr.exp
@@ -20,7 +20,7 @@
 # values, then write to the registers trough GDB, step once, and check
 # again if we read back the same values.
 
-if {![istarget "powerpc*-*-linux*"]} then {
+if {![istarget "powerpc*-*-linux*"]} {
     verbose "Skipping PowerPC test for PPR and DSCR registers."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
index b31c046c5f7..1403fa318ea 100644
--- a/gdb/testsuite/gdb.arch/powerpc-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-prologue.exp
@@ -17,7 +17,7 @@
 
 # Do not run on AIX (where we won't be able to build the tests without
 # some surgery) or on PowerPC64 (ditto, dot symbols).
-if {[istarget *-*-aix*] || ![istarget "powerpc-*-*"]} then {
+if {[istarget *-*-aix*] || ![istarget "powerpc-*-*"]} {
     verbose "Skipping PowerPC prologue tests."
     return
 }
@@ -43,7 +43,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-stackless.exp b/gdb/testsuite/gdb.arch/powerpc-stackless.exp
index 2323929e9a3..4fcb76419fc 100644
--- a/gdb/testsuite/gdb.arch/powerpc-stackless.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-stackless.exp
@@ -15,7 +15,7 @@
 
 # Testcase for PR tdep/17379.
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping powerpc-stackless.exp"
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-tar.exp b/gdb/testsuite/gdb.arch/powerpc-tar.exp
index 7b6d186050b..6d82a2a23df 100644
--- a/gdb/testsuite/gdb.arch/powerpc-tar.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-tar.exp
@@ -22,7 +22,7 @@
 # branch to TAR and check that we stop at the address that we wrote to
 # register.
 
-if {![istarget "powerpc*-*-linux*"]} then {
+if {![istarget "powerpc*-*-linux*"]} {
     verbose "Skipping PowerPC test for the TAR register."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
index b65db282d38..076a99afd8c 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vsx-gcore.exp
@@ -18,7 +18,7 @@
 # This test checks that generating and loading a core file preserves
 # the correct VSX register state.
 
-if {![istarget "powerpc*-*-linux*"] || [skip_vsx_tests]} then {
+if {![istarget "powerpc*-*-linux*"] || [skip_vsx_tests]} {
     verbose "Skipping PowerPC test for corefiles with VSX registers."
     return
 }
@@ -39,7 +39,7 @@ if {[build_executable "compile" $binfile $gen_src] == -1} {
 
 clean_restart $binfile
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx.exp b/gdb/testsuite/gdb.arch/powerpc-vsx.exp
index c4e13c154f0..2cb891b65d6 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vsx.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vsx.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx2.exp b/gdb/testsuite/gdb.arch/powerpc-vsx2.exp
index 05e4e98aee1..3181fda91d5 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vsx2.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vsx2.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc-vsx3.exp b/gdb/testsuite/gdb.arch/powerpc-vsx3.exp
index ad9f5b76e68..27ad96f37d0 100644
--- a/gdb/testsuite/gdb.arch/powerpc-vsx3.exp
+++ b/gdb/testsuite/gdb.arch/powerpc-vsx3.exp
@@ -20,7 +20,7 @@
 standard_testfile .s
 set objfile [standard_output_file ${testfile}.o]
 
-if {![istarget "powerpc*-*-*"]} then {
+if {![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC instructions disassembly."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
index 30ae74ed54f..ea2339252bb 100644
--- a/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
+++ b/gdb/testsuite/gdb.arch/powerpc64-prologue.exp
@@ -17,7 +17,7 @@
 
 # Do not run on AIX (where we won't be able to build the tests without
 # some surgery) or on PowerPC64 (ditto, dot symbols).
-if {[istarget *-*-aix*] || ![istarget "powerpc*-*-*"]} then {
+if {[istarget *-*-aix*] || ![istarget "powerpc*-*-*"]} {
     verbose "Skipping PowerPC prologue tests."
     return
 }
@@ -37,7 +37,7 @@ if { [prepare_for_testing "failed to prepare" $testfile "$srcfile" \
 }
 
 # Run to `main' where we begin our tests.
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/ppc-dfp.exp b/gdb/testsuite/gdb.arch/ppc-dfp.exp
index ecaf2499a0f..29eb7a31cb2 100644
--- a/gdb/testsuite/gdb.arch/ppc-dfp.exp
+++ b/gdb/testsuite/gdb.arch/ppc-dfp.exp
@@ -16,7 +16,7 @@
 
 # Tests for Powerpc Decimal Floating Point registers setting and fetching
 
-if ![istarget "powerpc*"] then {
+if {![istarget "powerpc*"]} {
     verbose "Skipping powerpc decimal floating point register tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/ppc-fp.exp b/gdb/testsuite/gdb.arch/ppc-fp.exp
index bd22d7c489e..dd5b9803ed4 100644
--- a/gdb/testsuite/gdb.arch/ppc-fp.exp
+++ b/gdb/testsuite/gdb.arch/ppc-fp.exp
@@ -16,7 +16,7 @@
 
 # Tests for Powerpc floating point register setting and fetching
 
-if ![istarget "powerpc*"] then {
+if {![istarget "powerpc*"]} {
     verbose "Skipping powerpc floating point register tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/ppc-longdouble.exp b/gdb/testsuite/gdb.arch/ppc-longdouble.exp
index 44f23d39381..76573fbbd51 100644
--- a/gdb/testsuite/gdb.arch/ppc-longdouble.exp
+++ b/gdb/testsuite/gdb.arch/ppc-longdouble.exp
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if ![istarget "powerpc*"] then {
+if {![istarget "powerpc*"]} {
     verbose "Skipping powerpc long-double floating point tests."
     return
 }
@@ -27,13 +27,13 @@ proc do_test { name {opts {}} } {
     set lines [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile.$name" executable $ccopts]
     # We get this warning even with the nowarnings option ...
     regsub -all "(^|\n)\[^\n\]*using \[^\n\]* extended precision long double" $lines "" lines
-    if { $lines != "" } then {
+    if {$lines != ""} {
         return
     }
 
     clean_restart ${binfile}.${name}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
         return
     }
 
diff --git a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
index 4fc9f9e2475..919b1a9a549 100644
--- a/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-atomic-inst.exp
@@ -36,7 +36,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug quie
 proc do_test { displaced } {
     global decimal hex
 
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/ppc64-break-on-_exit.exp b/gdb/testsuite/gdb.arch/ppc64-break-on-_exit.exp
index 4d1da73d7dd..c22bbf7f887 100644
--- a/gdb/testsuite/gdb.arch/ppc64-break-on-_exit.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-break-on-_exit.exp
@@ -45,7 +45,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
index 0f7ecd08e27..4316505c4dc 100644
--- a/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
+++ b/gdb/testsuite/gdb.arch/ppc64-isa207-atomic-inst.exp
@@ -40,7 +40,7 @@ proc do_test { displaced } {
     global decimal hex
     global gdb_prompt inferior_exited_re srcfile srcfile2
 
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.arch/pr25124.exp b/gdb/testsuite/gdb.arch/pr25124.exp
index e4bbea22373..a68a3d1b7df 100644
--- a/gdb/testsuite/gdb.arch/pr25124.exp
+++ b/gdb/testsuite/gdb.arch/pr25124.exp
@@ -16,7 +16,7 @@
 # Test proper disassembling of ARM thumb instructions when reloading a symbol
 # file.
 
-if {![is_aarch32_target]} then {
+if {![is_aarch32_target]} {
     verbose "Skipping ARM tests."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp b/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
index 6506f62fb1e..511e327226d 100644
--- a/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
+++ b/gdb/testsuite/gdb.arch/riscv-bp-infcall.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp b/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp
index bf319650db3..0bc5009fac3 100644
--- a/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp
+++ b/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp
@@ -32,7 +32,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp b/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
index 4c188b78b1f..8ee237a7411 100644
--- a/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
+++ b/gdb/testsuite/gdb.arch/riscv-reg-aliases.exp
@@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
    return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
index 385e16b575f..6d750b5e3a9 100644
--- a/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
+++ b/gdb/testsuite/gdb.arch/riscv-unwind-long-insn.exp
@@ -39,7 +39,7 @@ foreach_with_prefix {insn_size} {6 8} {
 	return -1
     }
 
-    if ![runto_main] then {
+    if {![runto_main]} {
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
index 04466e7184e..f07c04c71a6 100644
--- a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
+++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-ld-lw.exp
@@ -28,7 +28,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-mv.exp b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-mv.exp
index c90bebb3f49..212affb1f6d 100644
--- a/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-mv.exp
+++ b/gdb/testsuite/gdb.arch/riscv64-unwind-prologue-with-mv.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     fail "can't run to main"
     return 0
 }
diff --git a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
index e27808abeaf..7ba9e51cc3c 100644
--- a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp
@@ -18,7 +18,7 @@
 # This test exercises set/show disassembler-options results are preserved
 # across multiple set architecture calls.
 
-if {![istarget "s390*-*-*"]} then {
+if {![istarget "s390*-*-*"]} {
     verbose "Skipping S390 disassembler options."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/s390-stackless.exp b/gdb/testsuite/gdb.arch/s390-stackless.exp
index aeaf3235ad6..41354832775 100644
--- a/gdb/testsuite/gdb.arch/s390-stackless.exp
+++ b/gdb/testsuite/gdb.arch/s390-stackless.exp
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if {![istarget "s390*-*-*"]} then {
+if {![istarget "s390*-*-*"]} {
     verbose "Skipping s390 stackless test."
     return
 }
diff --git a/gdb/testsuite/gdb.arch/s390-tdbregs.exp b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
index 35690103e09..6bbccb60833 100644
--- a/gdb/testsuite/gdb.arch/s390-tdbregs.exp
+++ b/gdb/testsuite/gdb.arch/s390-tdbregs.exp
@@ -35,7 +35,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/sparc-sysstep.exp b/gdb/testsuite/gdb.arch/sparc-sysstep.exp
index c88abaa82c8..124811ca7ea 100644
--- a/gdb/testsuite/gdb.arch/sparc-sysstep.exp
+++ b/gdb/testsuite/gdb.arch/sparc-sysstep.exp
@@ -21,7 +21,7 @@
 # PC must be extracted from the sigreturn register save area in the
 # stack.
 
-if ![istarget "sparc*-*-linux*"] then {
+if {![istarget "sparc*-*-linux*"]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/sparc64-adi.exp b/gdb/testsuite/gdb.arch/sparc64-adi.exp
index ba1bce884c6..d0934564956 100644
--- a/gdb/testsuite/gdb.arch/sparc64-adi.exp
+++ b/gdb/testsuite/gdb.arch/sparc64-adi.exp
@@ -18,7 +18,7 @@
 # Basic tests of examining/assigning ADI version tags, and reporting 
 # precise mismatch.
 
-if ![istarget "sparc64*-*-linux*"] then {
+if {![istarget "sparc64*-*-linux*"]} {
     verbose "Skipping sparc64 ADI test."
     return 0
 }
@@ -30,7 +30,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile \
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/sparc64-regs.exp b/gdb/testsuite/gdb.arch/sparc64-regs.exp
index a617254863a..3c786db7c60 100644
--- a/gdb/testsuite/gdb.arch/sparc64-regs.exp
+++ b/gdb/testsuite/gdb.arch/sparc64-regs.exp
@@ -18,7 +18,7 @@
 # Tests decoding of various sparc64 registers.
 # At the moment, only few registers are tested, but more can be added in future.
 
-if ![istarget "sparc64*-*-linux*"] then {
+if {![istarget "sparc64*-*-linux*"]} {
     verbose "Skipping sparc64 register tests."
     return 0
 }
@@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
index ac62efa830c..ccc6fbfdca7 100644
--- a/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
+++ b/gdb/testsuite/gdb.arch/thumb-bx-pc.exp
@@ -15,7 +15,7 @@
 
 # Test PC adjustment from Thumb-mode "bx pc" instruction.
 
-if {![is_aarch32_target]} then {
+if {![is_aarch32_target]} {
     verbose "Skipping ARM tests."
     return
 }
@@ -28,7 +28,7 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $opts] {
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-prologue.exp b/gdb/testsuite/gdb.arch/thumb-prologue.exp
index 0d3e6b01bd7..0cb14572345 100644
--- a/gdb/testsuite/gdb.arch/thumb-prologue.exp
+++ b/gdb/testsuite/gdb.arch/thumb-prologue.exp
@@ -15,7 +15,7 @@
 
 # Test ARM/Thumb prologue analyzer.
 
-if {![is_aarch32_target]} then {
+if {![is_aarch32_target]} {
     verbose "Skipping ARM prologue tests."
     return
 }
@@ -39,7 +39,7 @@ gdb_load ${binfile}
 # Run to `main' where we begin our tests.
 #
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb-singlestep.exp b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
index f31e428b421..289bdf52463 100644
--- a/gdb/testsuite/gdb.arch/thumb-singlestep.exp
+++ b/gdb/testsuite/gdb.arch/thumb-singlestep.exp
@@ -15,7 +15,7 @@
 
 # Test single-stepping into incorrectly marked Thumb routine
 
-if {![is_aarch32_target]} then {
+if {![is_aarch32_target]} {
     verbose "Skipping ARM tests."
     return
 }
@@ -28,7 +28,7 @@ if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} [list debug $
     return -1
 }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/thumb2-it.exp b/gdb/testsuite/gdb.arch/thumb2-it.exp
index 3892c90d8ea..0e1a2c2ea4e 100644
--- a/gdb/testsuite/gdb.arch/thumb2-it.exp
+++ b/gdb/testsuite/gdb.arch/thumb2-it.exp
@@ -15,7 +15,7 @@
 
 # Test single stepping over Thumb-2 IT blocks.
 
-if {![istarget arm*-*eabi*]} then {
+if {![istarget arm*-*eabi*]} {
     verbose "Skipping Thumb-2 tests."
     return
 }
@@ -32,7 +32,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/vsx-regs.exp b/gdb/testsuite/gdb.arch/vsx-regs.exp
index c288b2f7d6f..67890154f6a 100644
--- a/gdb/testsuite/gdb.arch/vsx-regs.exp
+++ b/gdb/testsuite/gdb.arch/vsx-regs.exp
@@ -19,7 +19,7 @@
 #
 
 
-if {![istarget "powerpc*"] || [skip_vsx_tests]} then {
+if {![istarget "powerpc*"] || [skip_vsx_tests]} {
     verbose "Skipping vsx register tests."
     return
 }
@@ -47,7 +47,7 @@ gdb_load ${binfile}
 
 # Run to `main' where we begin our tests.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
index b5b2d584403..c2046977771 100644
--- a/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
+++ b/gdb/testsuite/gdb.arch/vsx-vsr-float28.exp
@@ -19,7 +19,7 @@
 #
 
 
-if {![istarget "powerpc*"] || [skip_vsx_tests]} then {
+if {![istarget "powerpc*"] || [skip_vsx_tests]} {
     verbose "Skipping vsr float128 field tests."
     return
 }
@@ -47,7 +47,7 @@ gdb_load ${binfile}
 
 # Run to `main' where we begin our tests.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }