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

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

diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index a01e9d762199dc5343958524b8f167ceb1ff175b..35da9113621e7d76201ef4d40ac2f3c73dace5a3 100644 (file)
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp b/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
index eb3fc9e35faf3c470da9e068616067c3abbdafe7..76386bb6df14ab01a257722d90f2c11cc985123c 100644 (file)
--- a/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
+++ b/gdb/testsuite/gdb.python/pretty-print-call-by-hand.exp
@@ -47,7 +47,7 @@ proc start_test { breakpoint_comment } {
 
     clean_restart ${binfile}
 
-    if { ![runto_main] } then {
+    if {![runto_main]} {
        untested "couldn't run to breakpoint"
        return -1
     }
@@ -66,7 +66,7 @@ proc start_test { breakpoint_comment } {
 
 # Start by testing the "run" command, it can't leverage start_test
 with_test_prefix "run to frame" {
-    if { ![runto_main] } then {
+    if {![runto_main]} {
        untested "couldn't run to main"
     }
 

diff --git a/gdb/testsuite/gdb.python/py-bad-printers.exp b/gdb/testsuite/gdb.python/py-bad-printers.exp
index 2ef7f487eda5f5292d5d2e7f8fbc70aa1d86d33f..01654ad024b1001416a20174056d4fe62632e1a1 100644 (file)
--- a/gdb/testsuite/gdb.python/py-bad-printers.exp
+++ b/gdb/testsuite/gdb.python/py-bad-printers.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp
index 0bc020aee9e5397cf65110abed81e3a508b4b50c..0a88aec56a08e5ac563d3c8916213a209e3c8305 100644 (file)
--- a/gdb/testsuite/gdb.python/py-block.exp
+++ b/gdb/testsuite/gdb.python/py-block.exp
@@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index c3215b13d5c1054946ae6c6f13d1c19e0e2de587..e36e87dc2917d46f8ddf2c82eb840ad1032bdacd 100644 (file)
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -46,7 +46,7 @@ proc_with_prefix test_bkpt_basic { } {
     # We should start with no breakpoints.
     gdb_test "python print (gdb.breakpoints())" "\\(\\)"
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -128,7 +128,7 @@ proc_with_prefix test_bkpt_deletion { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -163,7 +163,7 @@ proc_with_prefix test_bkpt_cond_and_cmds { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -220,7 +220,7 @@ proc_with_prefix test_bkpt_invisible { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -265,7 +265,7 @@ proc_with_prefix test_hardware_breakpoints { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -293,7 +293,7 @@ proc_with_prefix test_watchpoints { } {
        gdb_test_no_output "set can-use-hw-watchpoints 0" ""
     }
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -316,7 +316,7 @@ proc_with_prefix test_bkpt_internal { } {
     if {$skip_hw_watchpoint_tests_p} {
        gdb_test_no_output "set can-use-hw-watchpoints 0" ""
     }
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
     delete_breakpoints
@@ -364,7 +364,7 @@ proc_with_prefix test_bkpt_eval_funcs { } {
     if {$skip_hw_watchpoint_tests_p} {
        gdb_test_no_output "set can-use-hw-watchpoints 0" ""
     }
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
     delete_breakpoints
@@ -477,7 +477,7 @@ proc_with_prefix test_bkpt_temporary { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
     delete_breakpoints
@@ -595,7 +595,7 @@ proc_with_prefix test_bkpt_explicit_loc {} {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -680,7 +680,7 @@ proc_with_prefix test_bkpt_qualified {} {
     set one_location_re "Breakpoint $decimal at $hex:.*line $decimal."
     set two_location_re "Breakpoint $decimal at $hex:.*2 locations."
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -749,7 +749,7 @@ proc_with_prefix test_bkpt_probe {} {
        return -1
     }
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -766,7 +766,7 @@ proc_with_prefix test_catchpoints {} {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -825,7 +825,7 @@ proc_with_prefix test_bkpt_auto_disable { } {
     # Start with a fresh gdb.
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
     delete_breakpoints

diff --git a/gdb/testsuite/gdb.python/py-cmd.exp b/gdb/testsuite/gdb.python/py-cmd.exp
index 82f1c3575181375aaa5e83d1ca9d6519b428be8c..aa95a459f460b94bd53ed76f94555099b5206685 100644 (file)
--- a/gdb/testsuite/gdb.python/py-cmd.exp
+++ b/gdb/testsuite/gdb.python/py-cmd.exp
@@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-connection.exp b/gdb/testsuite/gdb.python/py-connection.exp
index 91315eb1af493f3ce5f542dc7e3885369d5156d0..fc212fc09c0461e116bb36a9cebe9a649fac1ecc 100644 (file)
--- a/gdb/testsuite/gdb.python/py-connection.exp
+++ b/gdb/testsuite/gdb.python/py-connection.exp
@@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-disasm.exp b/gdb/testsuite/gdb.python/py-disasm.exp
index 1f94d3e60f3d613c2220a1ea15e57097771bf586..2fe20c39d83a46fcefdd641a56c583137c0fa5fe 100644 (file)
--- a/gdb/testsuite/gdb.python/py-disasm.exp
+++ b/gdb/testsuite/gdb.python/py-disasm.exp
@@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} "debug"] }
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     fail "can't run to main"
     return 0
 }

diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 94762739cd45612cd1f69ee39ac61264599761b8..ce9342afaff6af38187af1ab491013775b091e3d 100644 (file)
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -317,7 +317,7 @@ with_test_prefix "gdb exiting: normal" {
 with_test_prefix "gdb exiting: error" {
     clean_restart ${testfile}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        fail "cannot run to main."
        return 0
     }

diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
index c525337990e02b1d6bd63b00708ed5a038759dc3..2f6c2f78e674dcd02e251525a3edf2fe0b759e39 100644 (file)
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint.exp
@@ -50,7 +50,7 @@ with_test_prefix "normal conditions" {
     clean_restart ${testfile}
     gdb_load_shlib ${lib_sl}
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -102,7 +102,7 @@ with_test_prefix "no debug symbol" {
        "import python scripts"
     set cond_line [gdb_get_line_number "Condition Break."]
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -129,7 +129,7 @@ with_test_prefix "function returned by longjump" {
     gdb_test "source $python_file" "Python script imported.*" \
        "import python scripts"
 
-    if ![runto call_longjmp_1] then {
+    if {![runto call_longjmp_1]} {
        return
     }
 
@@ -157,7 +157,7 @@ with_test_prefix "finish in dummy frame" {
        "import python scripts"
 
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -184,7 +184,7 @@ with_test_prefix "finish in normal frame" {
     gdb_test "source $python_file" "Python script imported.*" \
        "import python scripts"
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -213,7 +213,7 @@ with_test_prefix "explicit inferior function call" {
     gdb_test "source $python_file" "Python script imported.*" \
        "import python scripts"
 
-    if ![runto_main] then {
+    if {![runto_main]} {
        return 0
     }
 
@@ -240,7 +240,7 @@ with_test_prefix "explicit inferior function call" {
 #
 
 with_test_prefix "inferior exit" {
-    if ![runto "test_exec_exit"] then {
+    if {![runto "test_exec_exit"]} {
        return 0
     }
 
@@ -254,7 +254,7 @@ with_test_prefix "inferior exit" {
 #
 
 with_test_prefix "inferior exec" {
-    if ![runto "test_exec_exit"] then {
+    if {![runto "test_exec_exit"]} {
        return 0
     }
 

diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
index 6ad0bef88ea3929399fab055046e01b34f21b090..30758473d40dbe4c4215624f4bceb062533506c9 100644 (file)
--- a/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
+++ b/gdb/testsuite/gdb.python/py-finish-breakpoint2.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-format-string.exp b/gdb/testsuite/gdb.python/py-format-string.exp
index 45b08512c0cdfa157ee3b40ae9f379ecf938cff1..26b18ce1ab05a6d1812987c9e50c402f1ef60b49 100644 (file)
--- a/gdb/testsuite/gdb.python/py-format-string.exp
+++ b/gdb/testsuite/gdb.python/py-format-string.exp
@@ -52,7 +52,7 @@ proc prepare_gdb {exefile} {
   gdb_reinitialize_dir $srcdir/$subdir
   gdb_load ${exefile}
 
-  if ![runto_main] then {
+  if {![runto_main]} {
       perror "couldn't run to breakpoint"
       return
   }

diff --git a/gdb/testsuite/gdb.python/py-frame-inline.exp b/gdb/testsuite/gdb.python/py-frame-inline.exp
index 44726cae0c42056384d3dd7a66157aca07a91554..791749c27c647bcccdbe7768153e5acd6a89b1bb 100644 (file)
--- a/gdb/testsuite/gdb.python/py-frame-inline.exp
+++ b/gdb/testsuite/gdb.python/py-frame-inline.exp
@@ -24,7 +24,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-frame.exp b/gdb/testsuite/gdb.python/py-frame.exp
index 56e1ecdcedd54764139ab1d7dff841db6e635b8d..27130a95d79eea3bc7011312fde305a22d903a2c 100644 (file)
--- a/gdb/testsuite/gdb.python/py-frame.exp
+++ b/gdb/testsuite/gdb.python/py-frame.exp
@@ -29,7 +29,7 @@ if { [skip_python_tests] } { continue }
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
index 5fbce55ef3a212a737db1053607e382af9240710..81c434046a44c3d8bd5cf81c1041474ab9bdabcf 100644 (file)
--- a/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter-invalidarg.exp
@@ -51,7 +51,7 @@ gdb_load ${binfile}
 gdb_test "info auto-load python-scripts" "Yes.*${testfile}-gdb.py.*" \
     "Test auto-load had loaded python scripts"
 
-if ![runto_main] then {
+if {![runto_main]} {
     perror "couldn't run to breakpoint"
     return
 }

diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp
index 7a172e72d336ebaa074d8f69cdd72fa8e948e3f1..794d1c2944cf8d394f86039bdedcb068f152f72f 100644 (file)
--- a/gdb/testsuite/gdb.python/py-framefilter.exp
+++ b/gdb/testsuite/gdb.python/py-framefilter.exp
@@ -52,7 +52,7 @@ gdb_load ${binfile}
 gdb_test "info auto-load python-scripts" "Yes.*${testfile}-gdb.py.*" \
     "Test auto-load had loaded python scripts"
 
-if ![runto_main] then {
+if {![runto_main]} {
     perror "couldn't run to breakpoint"
     return
 }
@@ -310,7 +310,7 @@ gdb_load ${binfile}
 # Verify gdb loaded the script.
 gdb_test "info auto-load python-scripts" "Yes.*${testfile}-gdb.py.*" \
     "Set autoload path for no debug info tests"
-if ![runto_main] then {
+if {![runto_main]} {
     perror "couldn't run to breakpoint"
     return
 }

diff --git a/gdb/testsuite/gdb.python/py-inferior.exp b/gdb/testsuite/gdb.python/py-inferior.exp
index 552f9b17f4d9dccab85c3c3921304bc99c5a4d59..8fcd97a1b8df2185867125c728c371334511edb3 100644 (file)
--- a/gdb/testsuite/gdb.python/py-inferior.exp
+++ b/gdb/testsuite/gdb.python/py-inferior.exp
@@ -37,7 +37,7 @@ switch [get_endianness] {
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-infthread.exp b/gdb/testsuite/gdb.python/py-infthread.exp
index a7754198e603e7c748077f246e08f02f003b97e4..4ca2b86a63c46f653e0616a0a37069e78fd928a3 100644 (file)
--- a/gdb/testsuite/gdb.python/py-infthread.exp
+++ b/gdb/testsuite/gdb.python/py-infthread.exp
@@ -40,7 +40,7 @@ gdb_test_multiline "install new_thread event handler" \
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-nested-maps.exp b/gdb/testsuite/gdb.python/py-nested-maps.exp
index 70d4f771ec5a495bc28b3fbe2888e393aa5f44f2..ea71a793aeed63303a771ea68e30ea81d05d7d2c 100644 (file)
--- a/gdb/testsuite/gdb.python/py-nested-maps.exp
+++ b/gdb/testsuite/gdb.python/py-nested-maps.exp
@@ -34,7 +34,7 @@ if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } {
     return -1
 }
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-objfile.exp b/gdb/testsuite/gdb.python/py-objfile.exp
index 9565c16af96b0b6f75d555910d62fde9fd611ffb..80f2e7949477be7b40f9e74e692e135a8bfa23da 100644 (file)
--- a/gdb/testsuite/gdb.python/py-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-objfile.exp
@@ -27,7 +27,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-pending-frame-level.exp b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
index 57ee6b634cc2cd856595d68aa2e980d7ca1c634b..3cf8d4d639e76f8adccc15f9b8484e5e78a2fdee 100644 (file)
--- a/gdb/testsuite/gdb.python/py-pending-frame-level.exp
+++ b/gdb/testsuite/gdb.python/py-pending-frame-level.exp
@@ -26,7 +26,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index 8d8974c94c5f373bc40a928e620d3f240365c8e1..19cabe847f21c24c1cc648a26080531eac779084 100644 (file)
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -32,7 +32,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp
index c6040059cea656e8b5bb776c11f680ee6d171b51..46a346c194b76382b42a1917c97453d4ccad5711 100644 (file)
--- a/gdb/testsuite/gdb.python/py-prettyprint.exp
+++ b/gdb/testsuite/gdb.python/py-prettyprint.exp
@@ -42,7 +42,7 @@ proc run_lang_tests {exefile lang} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load ${exefile}
 
-    if ![runto_main ] then {
+    if {![runto_main]} {
        perror "couldn't run to breakpoint"
        return
     }
@@ -198,7 +198,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-if ![runto_main ] then {
+if {![runto_main]} {
     perror "couldn't run to breakpoint"
     return
 }

diff --git a/gdb/testsuite/gdb.python/py-rbreak.exp b/gdb/testsuite/gdb.python/py-rbreak.exp
index 4c641c9cb966f7c57e0ff1aeb180c623fa3b3d86..f32cffc6e579eaf2152da8fb76c0e070fabfbb4b 100644 (file)
--- a/gdb/testsuite/gdb.python/py-rbreak.exp
+++ b/gdb/testsuite/gdb.python/py-rbreak.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-record-btrace.exp b/gdb/testsuite/gdb.python/py-record-btrace.exp
index e9fdd06154e801cc19088c5c23482e1e3389a7d1..bbaf268c86a660a73b5bfa837abff6e934594a22 100644 (file)
--- a/gdb/testsuite/gdb.python/py-record-btrace.exp
+++ b/gdb/testsuite/gdb.python/py-record-btrace.exp
@@ -35,7 +35,7 @@ if { [skip_python_tests] } {
     return -1
 }
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-record-full.exp b/gdb/testsuite/gdb.python/py-record-full.exp
index f3ccefa275c75dfd55ad5ac1bcd5fe25a16495e1..52d6dd3da0b81b016c0830ea36a3fa617220f592 100644 (file)
--- a/gdb/testsuite/gdb.python/py-record-full.exp
+++ b/gdb/testsuite/gdb.python/py-record-full.exp
@@ -35,7 +35,7 @@ if { [skip_python_tests] } {
     return -1
 }
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-recurse-unwind.exp b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
index 6361417ca9cf61f144c148854379fc948177be7e..711b8b0995f46409b7572f83fe4911a7d8d33716 100644 (file)
--- a/gdb/testsuite/gdb.python/py-recurse-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-recurse-unwind.exp
@@ -40,7 +40,7 @@ gdb_test "source ${pyfile}" "Python script imported" \
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-shared.exp b/gdb/testsuite/gdb.python/py-shared.exp
index 7075bc5ee367d7dd39dc271f4f20de3333ef8c20..8dfd53acd267c102adfe5ba66f473515a7607537 100644 (file)
--- a/gdb/testsuite/gdb.python/py-shared.exp
+++ b/gdb/testsuite/gdb.python/py-shared.exp
@@ -48,7 +48,7 @@ if { [skip_python_tests] } { continue }
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-symbol.exp b/gdb/testsuite/gdb.python/py-symbol.exp
index ef4f86d005de2590db83a123c0eee6bf15555371..ad06b07c2c67193eded989a78271b16411373bd9 100644 (file)
--- a/gdb/testsuite/gdb.python/py-symbol.exp
+++ b/gdb/testsuite/gdb.python/py-symbol.exp
@@ -104,7 +104,7 @@ gdb_test "python print (gdb.lookup_static_symbol ('nonexistent') is None)" \
 gdb_test "python print (gdb.lookup_static_symbol ('qq') is None)" \
     "True" "lookup_static_symbol for global var"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -212,7 +212,7 @@ gdb_test "python print (gdb.lookup_global_symbol ('(anonymous namespace)::anon')
 gdb_test "python print (gdb.lookup_static_symbol ('(anonymous namespace)::anon').value ())" \
     "10" "print value of anon"
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -240,7 +240,7 @@ gdb_test "python print (cplusfunc.addr_class == gdb.SYMBOL_LOC_BLOCK)" "True" "t
 # test as it unloads the object file in GDB.
 # Start with a fresh gdb.
 clean_restart ${binfile}
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.python/py-symtab.exp
index 90750669a834ac8d31962442f7811ff5629af4bf..470710872c11846e3c2a6d75a8083dce9abe5578 100644 (file)
--- a/gdb/testsuite/gdb.python/py-symtab.exp
+++ b/gdb/testsuite/gdb.python/py-symtab.exp
@@ -27,7 +27,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp
index 729faef796641292b9d2c6542ee67852d575de87..25f3f52f4a365ae81a96ab50c8dea940eeb3c95c 100644 (file)
--- a/gdb/testsuite/gdb.python/py-template.exp
+++ b/gdb/testsuite/gdb.python/py-template.exp
@@ -43,7 +43,7 @@ proc test_template_arg {exefile type} {
        return -1
     }
     gdb_load ${exefile}
-    if ![runto_main ] then {
+    if {![runto_main]} {
        perror "couldn't run to breakpoint"
        return
     }

diff --git a/gdb/testsuite/gdb.python/py-type.exp b/gdb/testsuite/gdb.python/py-type.exp
index 20f5084c332d3fee2fe2fb891b307ee9c7d4b149..fbe56f35b4b6364cf743214e385f682f2350510d 100644 (file)
--- a/gdb/testsuite/gdb.python/py-type.exp
+++ b/gdb/testsuite/gdb.python/py-type.exp
@@ -41,7 +41,7 @@ proc restart_gdb {exefile} {
   gdb_reinitialize_dir $srcdir/$subdir
   gdb_load ${exefile}
 
-  if ![runto_main ] then {
+  if {![runto_main]} {
       perror "couldn't run to breakpoint"
       return
   }

diff --git a/gdb/testsuite/gdb.python/py-unwind-inline.exp b/gdb/testsuite/gdb.python/py-unwind-inline.exp
index 6667e29e446b50ee9b4ff95316d3e5944700af41..b316ec0a3f4cf8e42b5b87b1eb6d321131504a34 100644 (file)
--- a/gdb/testsuite/gdb.python/py-unwind-inline.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-inline.exp
@@ -29,7 +29,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
 if { [skip_python_tests] } { continue }
 
 # The following tests require execution.
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-unwind-maint.exp b/gdb/testsuite/gdb.python/py-unwind-maint.exp
index 7c88219089deaa076b64f890dbb12d73c9818a74..28121caf6bb7caeaa7ddf4b415509ec903231c39 100644 (file)
--- a/gdb/testsuite/gdb.python/py-unwind-maint.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-maint.exp
@@ -29,7 +29,7 @@ if { [skip_python_tests] } { continue }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 
-if ![runto_main ] then {
+if {![runto_main]} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
index 3430cbc3fbebe0e6f5b3c9913c5a40085f430466..182a5481b56cf0def819c657f596d6063fe8cdf4 100644 (file)
--- a/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
+++ b/gdb/testsuite/gdb.python/py-unwind-user-regs.exp
@@ -47,7 +47,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-unwind.exp b/gdb/testsuite/gdb.python/py-unwind.exp
index 798e76525dbcc4dc477efb5f2e2dda4b8978449e..515e1c07f217f2306ce60d0c25831566b26d49ff 100644 (file)
--- a/gdb/testsuite/gdb.python/py-unwind.exp
+++ b/gdb/testsuite/gdb.python/py-unwind.exp
@@ -37,7 +37,7 @@ if { ![istarget x86_64-*-* ] || ![is_lp64_target] } { continue }
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index b88c4515c8ce60b9854a6568c937b9684fc132c9..c04c98da162e86b131c0c1e88d55b890b3073623 100644 (file)
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -415,7 +415,7 @@ proc test_subscript_regression {exefile lang} {
  # Start with a fresh gdb.
  clean_restart ${exefile}
 
- if ![runto_main ] then {
+ if {![runto_main]} {
      perror "couldn't run to breakpoint"
      return
  }
@@ -652,7 +652,7 @@ test_add_to_history
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 

diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 48ff07e91e552dd6ff75c36e7af78636dcba57b4..15ec5256f2c294b9800761e26820fef2e2851e88 100644 (file)
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -217,7 +217,7 @@ clean_restart ${testfile}
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -431,7 +431,7 @@ clean_restart ${testfile}
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }
 
@@ -486,7 +486,7 @@ clean_restart ${testfile}
 
 # The following tests require execution.
 
-if ![runto_main] then {
+if {![runto_main]} {
     return 0
 }