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

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

diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index c14fb27e3f6f9ed98055421423c69224e5a7bb48..397b30e484b6ce7213648019f2605302974bc6be 100644 (file)
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -42,7 +42,7 @@ gdb_file_cmd $binfile
 # all subsequent line numbers are relative to this first one (baseline)
 
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
@@ -57,7 +57,7 @@ gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 set trcpt2 [gdb_gettpnum gdb_asm_test]
 set trcpt3 [gdb_gettpnum $testline1]
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
+if {$trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0} {
     fail "setting tracepoints"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index ec068b20d4ab12caf1cf72b2c8ce55228e86b2c1..20f0a388afc7d3d073db2bb099640fccebeed37b 100644 (file)
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -35,7 +35,7 @@ if ![runto_main] {
     return -1
 }
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 
@@ -106,7 +106,7 @@ all tests in this module will fail."
     }
 }
 
-if { $return_me == 1 } then {
+if {$return_me == 1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 5e31d0c77f6d3ce9294133e578a1d1a54461542b..4710b8d09529199b252dd2aaba7005252a798ba5 100644 (file)
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -53,7 +53,7 @@ if ![runto_main] {
     return -1
 }
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }

diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index c261b3c824d32d37df1a83aff1f22f367c500c05..c290684e0d8f9d69a82c7b522df3ade4309f3289 100644 (file)
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -796,7 +796,7 @@ proc gdb_trace_collection_test {} {
 
 runto_main
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index 1e2f10f76364d9c3f8df07a405efac58f326a020..605223aa3dbf576d989b1a692615fe1eb5a68de8 100644 (file)
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -43,7 +43,7 @@ gdb_file_cmd $binfile
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
@@ -81,7 +81,7 @@ gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 set trcpt2 [gdb_gettpnum gdb_asm_test]
 set trcpt3 [gdb_gettpnum $testline1]
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
+if {$trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0} {
     fail "setting tracepoints"
     return
 }
@@ -159,7 +159,7 @@ gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 set trcpt2 [gdb_gettpnum gdb_asm_test]
 set trcpt3 [gdb_gettpnum $testline1]
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
+if {$trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0} {
     fail "setting tracepoints"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 1504fb36508a177962cf94b6f748a922b57860a1..912e29123d39987eff209298e649d4fb84b48964 100644 (file)
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -47,7 +47,7 @@ gdb_file_cmd $binfile
 gdb_delete_tracepoints
 set c_test_num [gdb_gettpnum gdb_c_test]
 set asm_test_num [gdb_gettpnum gdb_asm_test]
-if { $c_test_num <= 0 || $asm_test_num <= 0 } then {
+if {$c_test_num <= 0 || $asm_test_num <= 0} {
     fail "setting tracepoints"
     return
 }
@@ -111,7 +111,7 @@ if {[gdb_test "" "Breakpoint ${decimal}, main.*" "run to main"] != 0} {
     return -1
 }
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
index 517e0394e060abfb2588173c1c6b95e0e074ab66..abf5fec1ba248ee342e5f761cc5f20eb76fc11d3 100644 (file)
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -69,7 +69,7 @@ proc test_reconnect { } {
        clean_restart $executable
        gdb_load_shlib $lib_sl1
        gdb_load_shlib $lib_sl2
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
        # Create tracepoints on marker and main, and leave them in the

diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 96251c900e7531ed577d0b712879f5616dd5ee41..a2cfa70b8f3cd3acac78f697591682d6d80ace1f 100644 (file)
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -151,7 +151,7 @@ proc test_upload_tsv { } {
        }
 
        clean_restart $testfile
-       if ![runto_main] then {
+       if {![runto_main]} {
            return 0
        }
 

diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
index b16ca83afa62276549b1c5af14643bf4bf530677..67a908de575df28f52ef53e8903bef44ac77bb38 100644 (file)
--- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
+++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
@@ -30,7 +30,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
 # can start programs ("run"), such as e.g., extended-remote gdbserver.
 clean_restart $testfile
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 9f019acaa004759ac735a458a07771cf7070fd94..0330e82c1a0bc86ade8e598675e2f5e126c27da9 100644 (file)
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -37,7 +37,7 @@ gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 

diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index 747e4207dd0b0a8a86a6cc0abe64e57a35c2db44..63f4788d07bdc214312b335fd2bb46b87b5338c0 100644 (file)
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -34,7 +34,7 @@ gdb_load $binfile
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 
@@ -50,7 +50,7 @@ if { ![gdb_target_supports_trace] } then {
 
 set baseline [gdb_find_recursion_test_baseline $srcfile]
 
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
@@ -74,7 +74,7 @@ gdb_delete_tracepoints
 set tdp2 [gdb_gettpnum "$testline2"]
 set tdp3 [gdb_gettpnum "$testline3"]
 set tdp4 [gdb_gettpnum "$testline4"]
-if { $tdp2 <= 0 || $tdp3 <= 0 || $tdp4 <= 0 } then {
+if {$tdp2 <= 0 || $tdp3 <= 0 || $tdp4 <= 0} {
     fail "setting tracepoints"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 52c95c533671d4159eecb78c7fcc8cf97dc34437..bbb3be7d58325acd44e5603dc2ca67524bced880 100644 (file)
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -40,7 +40,7 @@ gdb_file_cmd $binfile
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
@@ -55,7 +55,7 @@ gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 set trcpt2 [gdb_gettpnum gdb_asm_test]
 set trcpt3 [gdb_gettpnum $testline1]
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
+if {$trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0} {
     fail "setting tracepoints"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 7b3678d29f347cc27466d16cd1f173abaca62eb4..33e803bd4fe211e897ddf31dc7aa9c9d56dd4112 100644 (file)
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -35,7 +35,7 @@ gdb_load $binfile
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 
@@ -111,7 +111,7 @@ all tests in this module will fail."
     } 
 }
 
-if { $return_me == 1 } then {
+if {$return_me == 1} {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 0eac0b5503c12851fd63c878dfae1d461c28aa0a..ddeb20360aa3ea5088a5ed0c1b56cf3fa80d00b0 100644 (file)
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -41,7 +41,7 @@ gdb_file_cmd $binfile
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index d015381899bf44de404fb94c16f5f2c197e8d345..2e754891903df7ba7efed5c6cbc8dd99ef7a6c8b 100644 (file)
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -370,7 +370,7 @@ gdb_load_shlib $libipa
 if ![runto_main] {
     return -1
 }
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     # At this point, the socket file has been created.  We must make sure it is
     # removed when we return here.  GDB detaches inferior so that the socket
     # file can be removed.  Note that GDB simply kill inferior doesn't remove

diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 57b7b2fad706fb61a60b1b98eef83e6ff9fd223e..66b744fc11b5b3bd3a1410b328359b2ed6ce9f24 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -65,7 +65,7 @@ gdb_test "help tfind trace" "Select a trace frame by tracepoint number.*" \
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 
@@ -77,7 +77,7 @@ if { ![gdb_target_supports_trace] } then {
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
@@ -123,7 +123,7 @@ gdb_test_multiple "tstart" "6.1: tstart" {
     }
 }
 
-if { $return_me == 1 } then {
+if {$return_me == 1} {
     return -1
 }
 
@@ -154,7 +154,7 @@ gdb_test_multiple "tstop" "7.1: tstop" {
     }
 }
 
-if { $return_me == 1 } then {
+if {$return_me == 1} {
     return -1
 }
 
@@ -164,7 +164,7 @@ gdb_test "tstatus" "Trace stopped by a tstop command.*" \
 
 ## record starting PC
 set save_pc [gdb_readexpr "(unsigned long) \$pc"]
-if { $save_pc == -1 } then {
+if {$save_pc == -1} {
     fail "could not read PC"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index c2ec95a7a4ebc936cdc06855c217088c30b11c81..4bc16b1d344a3ba87374efa12b3e5381d353a535 100644 (file)
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -40,7 +40,7 @@ gdb_file_cmd $binfile
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 set baseline  [gdb_find_recursion_test_baseline $srcfile]
-if { $baseline == -1 } then {
+if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }

diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index ba64176596bc9c8afe2ad4670e56a8987fb5dfe1..80ec962c04266e8d1b5b2b3b13adef4220ff6561 100644 (file)
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -139,7 +139,7 @@ proc_with_prefix gdb_fast_trace_speed_test { } {
        }
 
     # If the fast tracepoint couldn't be set, don't bother with the run.
-    if { $run_ftrace == 1 } then {
+    if {$run_ftrace == 1} {
 
        # Begin the test.
        run_trace_experiment
@@ -160,7 +160,7 @@ gdb_load_shlib $ipalib
 
 runto_main
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index abf858963de9fb50500a3172fbccdd00dbd4262c..e51e7d654b1c0670940540f71731171d8d403538 100644 (file)
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -113,7 +113,7 @@ runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 # The rest of the testing needs actual tracing to work.
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }
@@ -121,7 +121,7 @@ if { ![gdb_target_supports_trace] } then {
 gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
 
-if { $trcpt1 <= 0 } then {
+if {$trcpt1 <= 0} {
     fail "setting tracepoints"
     return
 }
@@ -200,7 +200,7 @@ gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
 # Restart.
 clean_restart ${binfile}
 
-if ![runto_main] then {
+if {![runto_main]} {
     return
 }
 

diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 9e1124edc6ef01eca4cece199084441822578b68..82a6014c1bced37b6763c91300a8132151db3a37 100644 (file)
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -731,7 +731,7 @@ proc gdb_trace_collection_test {} {
 
 runto_main
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index c77bad73c2dc417181572f74a1e4be12a90a140b..0085e0aad48c8c835b711a3b80c43257e981eed2 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -36,7 +36,7 @@ gdb_load $binfile
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-if { ![gdb_target_supports_trace] } then {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return 1
 }

diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 77641b8a1307aaee676d4e15c0f62299f3116153..3d1b29bab0210cb5afb574eec2d58cc5c28dda64 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -44,7 +44,7 @@ gdb_file_cmd $binfile
 
 gdb_delete_tracepoints
 set trcpt1 [gdb_gettpnum gdb_c_test]
-if { $trcpt1 <= 0 } then {
+if {$trcpt1 <= 0} {
     fail "could not find gdb_c_test function"
     return
 }