From b70bf0c545d35a9df6bf0c2df0849f6db1697f83 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Tue, 30 Sep 2025 21:32:49 +0200
Subject: [PATCH] [gdb/testsuite, tclint] Fix gdb.trace

Running tclint on the test-cases in gdb.trace shows a few problems.

Fix these.
---
 gdb/tclint.toml                               |  1 -
 gdb/testsuite/gdb.trace/actions-changed.exp   |  4 +--
 gdb/testsuite/gdb.trace/actions.exp           |  8 +++---
 gdb/testsuite/gdb.trace/backtrace.exp         | 10 +++----
 gdb/testsuite/gdb.trace/change-loc.exp        | 14 +++++-----
 gdb/testsuite/gdb.trace/circ.exp              |  2 +-
 gdb/testsuite/gdb.trace/collection.exp        |  6 ++--
 gdb/testsuite/gdb.trace/deltrace.exp          |  8 +++---
 .../gdb.trace/disconnected-tracing.exp        | 12 ++++----
 gdb/testsuite/gdb.trace/entry-values.exp      |  6 ++--
 gdb/testsuite/gdb.trace/ftrace-lock.exp       |  8 +++---
 gdb/testsuite/gdb.trace/ftrace.exp            | 14 +++++-----
 gdb/testsuite/gdb.trace/infotrace.exp         |  4 +--
 .../gdb.trace/mi-trace-frame-collected.exp    |  4 +--
 .../gdb.trace/mi-trace-unavailable.exp        | 12 ++++----
 .../gdb.trace/mi-traceframe-changed.exp       |  6 ++--
 .../gdb.trace/mi-tracepoint-changed.exp       |  4 +--
 gdb/testsuite/gdb.trace/mi-tsv-changed.exp    | 14 +++++-----
 gdb/testsuite/gdb.trace/no-attach-trace.exp   |  2 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp         | 10 +++----
 gdb/testsuite/gdb.trace/passcount.exp         |  6 ++--
 gdb/testsuite/gdb.trace/pending.exp           | 22 +++++++--------
 gdb/testsuite/gdb.trace/pr16508.exp           |  8 +++---
 gdb/testsuite/gdb.trace/qtro.exp              |  4 +--
 gdb/testsuite/gdb.trace/range-stepping.exp    | 12 ++++----
 gdb/testsuite/gdb.trace/read-memory.exp       |  6 ++--
 gdb/testsuite/gdb.trace/report.exp            | 20 ++++++-------
 gdb/testsuite/gdb.trace/save-trace.exp        | 14 +++++-----
 gdb/testsuite/gdb.trace/signal.exp            | 12 ++++----
 gdb/testsuite/gdb.trace/status-stop.exp       | 14 +++++-----
 gdb/testsuite/gdb.trace/strace.exp            | 18 ++++++------
 gdb/testsuite/gdb.trace/tfind.exp             | 12 ++++----
 gdb/testsuite/gdb.trace/trace-break.exp       | 28 +++++++++----------
 gdb/testsuite/gdb.trace/trace-buffer-size.exp |  8 +++---
 gdb/testsuite/gdb.trace/trace-condition.exp   | 12 ++++----
 .../gdb.trace/trace-enable-disable.exp        |  6 ++--
 gdb/testsuite/gdb.trace/trace-mt.exp          | 10 +++----
 gdb/testsuite/gdb.trace/tracecmd.exp          |  6 ++--
 .../gdb.trace/tracefile-pseudo-reg.exp        |  4 +--
 gdb/testsuite/gdb.trace/tspeed.exp            |  6 ++--
 gdb/testsuite/gdb.trace/tstatus.exp           |  8 +++---
 gdb/testsuite/gdb.trace/tsv.exp               |  2 +-
 .../gdb.trace/unavailable-dwarf-piece.exp     |  4 +--
 gdb/testsuite/gdb.trace/unavailable.exp       |  4 +--
 gdb/testsuite/gdb.trace/while-stepping.exp    |  2 +-
 45 files changed, 198 insertions(+), 199 deletions(-)

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index 62e522c1764..ba6fbd92ef2 100644
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -39,7 +39,6 @@ exclude = [
 "gdb/testsuite/gdb.cp",
 "gdb/testsuite/gdb.dwarf2",
 "gdb/testsuite/gdb.mi",
-"gdb/testsuite/gdb.trace",
 # IGNORE (document reason in trailing comment):
 "gdb/testsuite/gdb.stabs", # To be removed.
 ]
diff --git a/gdb/testsuite/gdb.trace/actions-changed.exp b/gdb/testsuite/gdb.trace/actions-changed.exp
index 556dab52a71..ef5acba4e32 100644
--- a/gdb/testsuite/gdb.trace/actions-changed.exp
+++ b/gdb/testsuite/gdb.trace/actions-changed.exp
@@ -161,11 +161,11 @@ proc test_actions_changed { } {
 
 clean_restart $testfile
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 9bb38e13a9b..89db2a6daae 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -37,7 +37,7 @@ if {$baseline == -1} {
     return
 }
 
-set testline1 [expr $baseline + 7]
+set testline1 [expr {$baseline + 7}]
 
 #
 # test actions command
@@ -165,8 +165,8 @@ gdb_test_multiple "info tracepoints" "5.5c: verify NO actions for first tracepoi
 
 # 5.6 actions for invalid tracepoint number
 
-gdb_test "actions [expr $trcpt2 + $trcpt3]" \
-    "No tracepoint number [expr $trcpt2 + $trcpt3]." \
+gdb_test "actions [expr {$trcpt2 + $trcpt3}]" \
+    "No tracepoint number [expr {$trcpt2 + $trcpt3}]." \
 			"5.6: actions for invalid tracepoint number"
 
 # 5.7 invalid action (other than 'collect', 'while-stepping' or 'end')
@@ -245,7 +245,7 @@ if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 57073bdaf3c..7707edbde9b 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -23,12 +23,12 @@ set expfile $testfile.exp
 
 require gdb_trace_common_supports_arch
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	[list debug nowarnings nopie]] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 [list debug nowarnings nopie]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
@@ -155,13 +155,13 @@ gdb_test_no_output "tstop" ""
 
 proc gdb_backtrace_tdp_1 { msg } {
     global gdb_prompt
-    
+
     # We are in a trace frame at which we didn't collect anything
     # except $PC.  Therefore we expect to be able to identify stack
     # frame #0, but that's about all.  In particular we do not expect
     # to be able to display the function's arguments or locals, and we
     # do not expect to be able to identify the caller of this function.
-    
+
     gdb_test "backtrace" \
 	"#0\[\t \]+gdb_recursion_test.*depth=.*" \
 	"$msg"
diff --git a/gdb/testsuite/gdb.trace/change-loc.exp b/gdb/testsuite/gdb.trace/change-loc.exp
index 67ac4765eee..12b862cf51f 100644
--- a/gdb/testsuite/gdb.trace/change-loc.exp
+++ b/gdb/testsuite/gdb.trace/change-loc.exp
@@ -44,7 +44,7 @@ clean_restart $executable
 gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
@@ -64,7 +64,7 @@ proc tracepoint_change_loc_1 { trace_type } {
 	global gdb_prompt
 
 	clean_restart ${testfile}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 	gdb_test_no_output "delete break 1"
@@ -88,7 +88,7 @@ proc tracepoint_change_loc_1 { trace_type } {
 	set test "set tracepoint on set_tracepoint"
 	gdb_test_multiple "${trace_type} set_tracepoint" $test {
 	    -re "Target returns error code .* too far .*$gdb_prompt $" {
-		if [string equal $trace_type "ftrace"] {
+		if {[string equal $trace_type "ftrace"]} {
 		    # The target was unable to install the fast tracepoint
 		    # (e.g., jump pad too far from tracepoint).
 		    pass "$test (too far)"
@@ -113,7 +113,7 @@ proc tracepoint_change_loc_1 { trace_type } {
 	set test "continue to marker 2"
 	gdb_test_multiple "continue" $test {
 	    -re "Target returns error code .* too far .*$gdb_prompt $" {
-		if [string equal $trace_type "ftrace"] {
+		if {[string equal $trace_type "ftrace"]} {
 		    # Expected if the target was unable to install the
 		    # fast tracepoint (e.g., jump pad too far from
 		    # tracepoint).
@@ -230,7 +230,7 @@ proc tracepoint_change_loc_2 { trace_type } {
 		pass "tstart"
 	    }
 	    -re "Target returns error code .* too far .*$gdb_prompt $" {
-		if [string equal $trace_type "ftrace"] {
+		if {[string equal $trace_type "ftrace"]} {
 		    # The target was unable to install the fast tracepoint
 		    # (e.g., jump pad too far from tracepoint).
 		    pass "$test (too far)"
@@ -291,12 +291,12 @@ proc tracepoint_install_in_trace_disabled { trace_type } {
 	global gdb_prompt
 
 	# This test only makes sense with remote targets.
-	if ![gdb_protocol_is_remote] {
+	if {![gdb_protocol_is_remote]} {
 	    return
 	}
 
 	clean_restart ${testfile}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
index 3354c0f3649..73802a92fef 100644
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ b/gdb/testsuite/gdb.trace/circ.exp
@@ -37,7 +37,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning
 #
 
 # Set a tracepoint on given func.  The tracepoint is set at entry
-# address and not 'after prologue' address because we use 
+# address and not 'after prologue' address because we use
 # 'tfind pc func' to find the corresponding trace frame afterwards,
 # and that looks for entry address.
 proc set_a_tracepoint { func } {
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index f0946ee4ace..a60b7207e06 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -23,7 +23,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarning
     return -1
 }
 
-# Tests: 
+# Tests:
 # 1) $args
 # 2) function args by name
 # 3) $locs
@@ -701,7 +701,7 @@ proc gdb_trace_collection_test {} {
     gdb_collect_registers_test "\$$fpreg, \$$spreg, \$$pcreg"
     gdb_collect_globals_test
     gdb_collect_global_in_pieces_test
-    
+
     #
     # Expression tests:
     #
@@ -747,7 +747,7 @@ proc gdb_trace_collection_test {} {
     # x[(y, z)] (tests comma expression) (ditto)
     # cast expr
     # stack data
-    
+
     gdb_collect_expression_test globals_test_func \
 	    "globalstruct.memberi"  "82"     "a.b"
     gdb_collect_expression_test globals_test_func \
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index d05fe64434c..61f5ef6594d 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -37,7 +37,7 @@ if {$baseline == -1} {
     fail "could not find gdb_recursion_test function"
     return
 }
-set testline1 [expr $baseline + 4]
+set testline1 [expr {$baseline + 4}]
 
 #
 # test "delete tracepoints" command
@@ -185,11 +185,11 @@ gdb_test_multiple "delete tracepoint $trcpt1 $trcpt2 $trcpt3" \
 
 gdb_test "info tracepoints" \
     "No tracepoints." \
-			"3.3c: verify delete three tracepoints" 
+			"3.3c: verify delete three tracepoints"
 
 # 3.4 delete invalid tracepoint number
-gdb_test "delete tracepoint [expr $trcpt2 + $trcpt3]" \
-    "No breakpoint number [expr $trcpt2 + $trcpt3]." \
+gdb_test "delete tracepoint [expr {$trcpt2 + $trcpt3}]" \
+    "No breakpoint number [expr {$trcpt2 + $trcpt3}]." \
 			"3.4: delete invalid tracepoint number"
 
 # 3.5 delete tracepoint number zero
diff --git a/gdb/testsuite/gdb.trace/disconnected-tracing.exp b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
index 5a4e882b804..9a09a663b9d 100644
--- a/gdb/testsuite/gdb.trace/disconnected-tracing.exp
+++ b/gdb/testsuite/gdb.trace/disconnected-tracing.exp
@@ -27,16 +27,16 @@ if { [info proc gdb_reconnect] == "" } {
     return -1
 }
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-        {debug nowarnings}] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 {debug nowarnings}]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -51,7 +51,7 @@ proc disconnected_tracing {  } {
 
 	# Start with a fresh gdb.
 	clean_restart ${executable}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -113,7 +113,7 @@ proc disconnected_tfind {  } {
 
 	# Start with a fresh gdb.
 	clean_restart ${executable}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index 1d2e8e9fb90..f6c4c5c1b6f 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -165,7 +165,7 @@ if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
 
 clean_restart ${testfile}
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
@@ -199,11 +199,11 @@ clean_restart $testfile
 
 load_lib "trace-support.exp"
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/ftrace-lock.exp b/gdb/testsuite/gdb.trace/ftrace-lock.exp
index 8c9d4aaca8e..42e871113e8 100644
--- a/gdb/testsuite/gdb.trace/ftrace-lock.exp
+++ b/gdb/testsuite/gdb.trace/ftrace-lock.exp
@@ -22,7 +22,7 @@ require gdb_trace_common_supports_arch
 standard_testfile
 
 # make check RUNTESTFLAGS='gdb.trace/ftrace-lock.exp NUM_THREADS=2'
-if ![info exists NUM_THREADS] {
+if {![info exists NUM_THREADS]} {
     set NUM_THREADS 2
 }
 
@@ -37,11 +37,11 @@ with_test_prefix "runtime trace support check" {
 	return
     }
 
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
-    if ![gdb_target_supports_trace] {
+    if {![gdb_target_supports_trace]} {
 	unsupported "target does not support trace"
 	return -1
     }
@@ -59,7 +59,7 @@ if { [prepare_for_testing "prepare for testing with libipa" \
     return
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp
index ac6e473a641..3192bdde19b 100644
--- a/gdb/testsuite/gdb.trace/ftrace.exp
+++ b/gdb/testsuite/gdb.trace/ftrace.exp
@@ -25,16 +25,16 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 require gdb_trace_common_supports_arch
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	[list debug $additional_flags]] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 [list debug $additional_flags]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -54,7 +54,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 }
 clean_restart ${executable}
 
-if ![runto_main] {
+if {![runto_main]} {
     return 0
 }
 
@@ -130,7 +130,7 @@ proc test_fast_tracepoints {} {
 
             set minaddr [exec sh -c "cat /proc/sys/vm/mmap_min_addr"]
 
-            if { [expr $minaddr > 64512] } {
+            if {$minaddr > 64512} {
                 warning "mmap_min_addr > 64512, fast tracepoint will fail"
                 warning "do \"sudo sysctl -w vm.mmap_min_addr=32768\" to adjust"
             }
@@ -190,7 +190,7 @@ proc test_fast_tracepoints {} {
     # fast tracepoints RSP feature, and confirm fast tracepoints
     # can no longer be downloaded.
     set test "fast tracepoint could not be downloaded with the feature disabled"
-    if [gdb_protocol_is_remote] {
+    if {[gdb_protocol_is_remote]} {
         gdb_test "set remote fast-tracepoints-packet off"
 
         gdb_test_multiple "tstart" $test {
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 7ba4ed3c337..47121ca83b9 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -66,8 +66,8 @@ gdb_test "info tracepoint $asm_test_num" \
     "2.2b: info tracepoint $asm_test_num (gdb_asm_test)"
 
 # 2.3 info tracepoint (invalid tracepoint number)
-gdb_test "info tracepoint [expr $c_test_num + $asm_test_num]" \
-    "No tracepoint matching '[expr $c_test_num + $asm_test_num]'." \
+gdb_test "info tracepoint [expr {$c_test_num + $asm_test_num}]" \
+    "No tracepoint matching '[expr {$c_test_num + $asm_test_num}]'." \
     "2.3: info tracepoint (invalid tracepoint number)"
 
 # 2.4 info tracepoints (list of numbers)
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index 9b4f053963a..1aaf27ce454 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -23,11 +23,11 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] }
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index dd22046a0cf..34013fb9220 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -21,11 +21,11 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug nopi
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
@@ -129,16 +129,16 @@ proc test_trace_unavailable { data_source } {
 
 	set pcnum -1
 	set gpr0num -1
-	if [is_amd64_regs_target] {
+	if {[is_amd64_regs_target]} {
 	    set pcnum 16
 	    set gpr0num 0
-	} elseif [is_x86_like_target] {
+	} elseif {[is_x86_like_target]} {
 	    set pcnum 8
 	    set gpr0num 0
-	} elseif [is_aarch64_target] {
+	} elseif {[is_aarch64_target]} {
 	    set pcnum 32
 	    set gpr0num 0
-	} elseif [istarget "powerpc*-*-*"] {
+	} elseif {[istarget "powerpc*-*-*"]} {
 	    set pcnum 64
 	    set gpr0num 0
 	} elseif { [istarget "s390*-*-*"] } {
diff --git a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
index 90a053c9315..029869bd460 100644
--- a/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-traceframe-changed.exp
@@ -78,7 +78,7 @@ proc test_tfind_tfile { } {
 
 # If tracefile is generated successfully, copy tracefile to host and
 # run tests.
-if [generate_tracefile $binfile] {
+if {[generate_tracefile $binfile]} {
     if {!$purely_local} {
 	# Copy tracefile from target to host.
 	remote_download host [remote_upload target tfile-basic.tf] \
@@ -105,11 +105,11 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 
 clean_restart $executable
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+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 99f7bf9b67b..da625633c42 100644
--- a/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tracepoint-changed.exp
@@ -228,11 +228,11 @@ clean_restart $executable
 gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
index 6f71e79c93b..c69ae89a005 100644
--- a/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
+++ b/gdb/testsuite/gdb.trace/mi-tsv-changed.exp
@@ -36,7 +36,7 @@ proc test_create_delete_modify_tsv { } {
 	global srcdir subdir
 	global mi_gdb_prompt
 
-	if [mi_gdb_start] {
+	if {[mi_gdb_start]} {
 	    return
 	}
 	mi_gdb_load ${binfile}
@@ -67,11 +67,11 @@ proc test_create_delete_modify_tsv { } {
 	# Test target supports tracepoints or not.
 	clean_restart $testfile
 
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
-	if ![gdb_target_supports_trace] {
+	if {![gdb_target_supports_trace]} {
 	    unsupported "current target does not support trace"
 	    return -1
 	}
@@ -201,12 +201,12 @@ proc test_upload_tsv { } {
 	    }
 	}
 
-	if $tsv1_created {
+	if {$tsv1_created} {
 	    pass "tsv1 created"
 	} else {
 	    fail "tsv1 created"
 	}
-	if $tsv2_created {
+	if {$tsv2_created} {
 	    pass "tsv2 created"
 	} else {
 	    fail "tsv2 created"
@@ -222,11 +222,11 @@ proc test_upload_tsv { } {
 
 clean_restart $testfile
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/no-attach-trace.exp b/gdb/testsuite/gdb.trace/no-attach-trace.exp
index e1decfc54c1..5f7795d887f 100644
--- a/gdb/testsuite/gdb.trace/no-attach-trace.exp
+++ b/gdb/testsuite/gdb.trace/no-attach-trace.exp
@@ -42,7 +42,7 @@ gdb_test "trace main" \
 gdb_test "tstart" "Target returns error code.*\."
 
 with_test_prefix "after tstart" {
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 }
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index b4ec45a6ce4..2c7698a6eeb 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -52,16 +52,16 @@ if {$baseline == -1} {
 # define relative source line numbers:
 # all subsequent line numbers are relative to this first one (baseline)
 
-set testline2  [expr $baseline +  4]
-set testline3  [expr $baseline +  5]
-set testline4  [expr $baseline +  6]
+set testline2  [expr {$baseline +  4}]
+set testline3  [expr {$baseline +  5}]
+set testline4  [expr {$baseline +  6}]
 
 #
 # test passcount command semantics (live test)
 #
 
 ## Set three tracepoints with three different passcounts.
-## Verify that the experiment stops after the one with the 
+## Verify that the experiment stops after the one with the
 ## lowest passcount is hit.
 
 gdb_delete_tracepoints
@@ -125,7 +125,7 @@ with_test_prefix "trace_frame 4" {
 }
 
 ## We should now be at the last frame, because this frame's passcount
-## should have caused collection to stop.  If we do a tfind now, 
+## should have caused collection to stop.  If we do a tfind now,
 ## it should fail.
 
 gdb_test "tfind" "failed to find.*" "4.5: dynamic passcount test"
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index f1b4e9e3084..37d5c0932a6 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -36,7 +36,7 @@ if {$baseline == -1} {
     return
 }
 
-set testline1  [expr $baseline + 3]
+set testline1  [expr {$baseline + 3}]
 
 #
 # test "passcount" command
@@ -212,8 +212,8 @@ gdb_test "info tracepoints" \
 
 # 4.8 set passcount for invalid tracepoint
 
-gdb_test "passcount 1 [expr $trcpt2 + $trcpt3]" \
-	"No tracepoint number [expr $trcpt2 + $trcpt3]." \
+gdb_test "passcount 1 [expr {$trcpt2 + $trcpt3}]" \
+	"No tracepoint number [expr {$trcpt2 + $trcpt3}]." \
 	"4.8: invalid tracepoint number in passcount"
 
 # 4.9 help passcount
diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp
index 39e3abb673a..fdf321bbc5b 100644
--- a/gdb/testsuite/gdb.trace/pending.exp
+++ b/gdb/testsuite/gdb.trace/pending.exp
@@ -46,11 +46,11 @@ clean_restart $executable
 gdb_load_shlib $lib_sl1
 gdb_load_shlib $lib_sl2
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
@@ -138,7 +138,7 @@ proc pending_tracepoint_works { trace_type } {
 		pass $test
 	    }
 	    -re "Target returns error code .* too far .*$gdb_prompt $" {
-		if [string equal $trace_type "ftrace"] {
+		if {[string equal $trace_type "ftrace"]} {
 		    # The target was unable to install the fast tracepoint
 		    # (e.g., jump pad too far from tracepoint).
 		    pass "$test (too far)"
@@ -179,7 +179,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
 
     # Start with a fresh gdb.
     clean_restart $executable
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -206,7 +206,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \
     set test "continue to marker 2"
     gdb_test_multiple "continue" $test {
 	-re "Target returns error code .* too far .*$gdb_prompt $" {
-	    if [string equal $trace_type "ftrace"] {
+	    if {[string equal $trace_type "ftrace"]} {
 		# Expected if the target was unable to install the
 		# fast tracepoint (e.g., jump pad too far from
 		# tracepoint).
@@ -247,7 +247,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
 
     # Start with a fresh gdb.
     clean_restart $executable
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -278,7 +278,7 @@ proc pending_tracepoint_installed_during_trace { trace_type } \
     set test "continue to marker 2"
     gdb_test_multiple "continue" $test {
 	-re "Target returns error code .* too far .*$gdb_prompt $" {
-	    if [string equal $trace_type "ftrace"] {
+	    if {[string equal $trace_type "ftrace"]} {
 		# Expected if the target was unable to install the
 		# fast tracepoint (e.g., jump pad too far from
 		# tracepoint).
@@ -320,7 +320,7 @@ proc pending_tracepoint_disconnect_during_trace { trace_type } \
 
     # Start with a fresh gdb.
     clean_restart $executable
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -367,7 +367,7 @@ proc pending_tracepoint_disconnect_after_resolved { trace_type } \
 
     # Start with a fresh gdb.
     clean_restart $executable
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -419,7 +419,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
 
     # Start with a fresh gdb.
     clean_restart $executable
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -449,7 +449,7 @@ proc pending_tracepoint_with_action_resolved { trace_type } \
     set test "continue to marker 2"
     gdb_test_multiple "continue" $test {
 	    -re "Target returns error code .* too far .*$gdb_prompt $" {
-            if [string equal $trace_type "ftrace"] {
+            if {[string equal $trace_type "ftrace"]} {
 		# Expected if the target was unable to install the
 		# fast tracepoint (e.g., jump pad too far from
 		# tracepoint).
diff --git a/gdb/testsuite/gdb.trace/pr16508.exp b/gdb/testsuite/gdb.trace/pr16508.exp
index 2284ab28b54..37405ff64bf 100644
--- a/gdb/testsuite/gdb.trace/pr16508.exp
+++ b/gdb/testsuite/gdb.trace/pr16508.exp
@@ -17,16 +17,16 @@ load_lib "trace-support.exp"
 standard_testfile read-memory.c
 set executable $testfile
 
-if [prepare_for_testing "failed to prepare for trace tests" \
-	$executable $srcfile [list debug]] {
+if {[prepare_for_testing "failed to prepare for trace tests" \
+	 $executable $srcfile [list debug]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/qtro.exp b/gdb/testsuite/gdb.trace/qtro.exp
index 78170acce70..cf3ade646ea 100644
--- a/gdb/testsuite/gdb.trace/qtro.exp
+++ b/gdb/testsuite/gdb.trace/qtro.exp
@@ -30,13 +30,13 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
 # Check whether the target supports tracepoints.
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "current target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/range-stepping.exp b/gdb/testsuite/gdb.trace/range-stepping.exp
index 396ed0274b1..915f0a2dc78 100644
--- a/gdb/testsuite/gdb.trace/range-stepping.exp
+++ b/gdb/testsuite/gdb.trace/range-stepping.exp
@@ -19,21 +19,21 @@ load_lib "range-stepping-support.exp"
 standard_testfile
 set executable $testfile
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	{debug nowarnings}] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 {debug nowarnings}]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
 
-if ![gdb_range_stepping_enabled] {
+if {![gdb_range_stepping_enabled]} {
     unsupported "range stepping not supported by the target"
     return -1
 }
@@ -79,7 +79,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 
 clean_restart ${executable}
 
-if ![runto_main] {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/read-memory.exp b/gdb/testsuite/gdb.trace/read-memory.exp
index 558c0ea4bcf..b369b408c71 100644
--- a/gdb/testsuite/gdb.trace/read-memory.exp
+++ b/gdb/testsuite/gdb.trace/read-memory.exp
@@ -21,11 +21,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nopie}]}
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -37,7 +37,7 @@ proc set_tracepoint_and_collect { } {
 
     # Start with a fresh gdb.
     clean_restart ${testfile}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
     gdb_breakpoint "end" qualified
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index f2a04f7e63d..0b964d6d426 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -100,7 +100,7 @@ all tests in this module will fail."
 	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
-    } 
+    }
 }
 
 if {$return_me == 1} {
@@ -288,27 +288,27 @@ proc use_collected_data { data_source } {
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline1 .tracepoint .$tdp1\\)\r\n" {
-		set linecount1 [expr $linecount1 + 1]
+		set linecount1 [expr {$linecount1 + 1}]
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline2 .tracepoint .$tdp2\\)\r\n" {
-		set linecount2 [expr $linecount2 + 1]
+		set linecount2 [expr {$linecount2 + 1}]
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline3 .tracepoint .$tdp3\\)\r\n" {
-		set linecount3 [expr $linecount3 + 1]
+		set linecount3 [expr {$linecount3 + 1}]
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline4 .tracepoint .$tdp4\\)\r\n" {
-		set linecount4 [expr $linecount4 + 1]
+		set linecount4 [expr {$linecount4 + 1}]
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline5 .tracepoint .$tdp5\\)\r\n" {
-		set linecount5 [expr $linecount5 + 1]
+		set linecount5 [expr {$linecount5 + 1}]
 		exp_continue
 	    }
 	    -re "^\[^\r\n\]* line $testline6 .tracepoint .$tdp6\\)\r\n" {
-		set linecount6 [expr $linecount6 + 1]
+		set linecount6 [expr {$linecount6 + 1}]
 		exp_continue
 	    }
 	    -re "^No trace frame found\r\n$gdb_prompt $" {
@@ -328,7 +328,7 @@ proc use_collected_data { data_source } {
 
 	gdb_test_multiple "while \$trace_frame != -1\n printf \"tracepoint #\%d, FP 0x\%08x, SP 0x\%08x, PC 0x%08x\\n\", \$tracepoint, \$fp, \$sp, \$pc\n tfind tracepoint\n end" "12.2: trace report #2" {
 	    -re "tracepoint #$tdp2, FP $hex, SP $hex, PC $hex" {
-		set linecount2 [expr $linecount2 + 1]
+		set linecount2 [expr {$linecount2 + 1}]
 		exp_continue
 	    }
 	    -re ".*$gdb_prompt $" {
@@ -348,7 +348,7 @@ proc use_collected_data { data_source } {
 
 	gdb_test_multiple "while \$trace_frame != -1\n printf \"TDP #\%d, frame \%d: depth = \%d, q1 = \%d\\n\", \$tracepoint, \$trace_frame, depth, q1\n tfind tracepoint\n end" "12.3: trace report #3" {
 	    -re "TDP #$tdp3, frame $decimal: depth = $decimal, q1 = $decimal" {
-		set linecount3 [expr $linecount3 + 1]
+		set linecount3 [expr {$linecount3 + 1}]
 		exp_continue
 	    }
 	    -re ".*$gdb_prompt $" {
@@ -368,7 +368,7 @@ proc use_collected_data { data_source } {
 
 	gdb_test_multiple "while \$trace_frame != -1\n printf \"TDP #\%d, frame %d: char_test = \%d, long_test = \%d\\n\", \$tracepoint, \$trace_frame, gdb_char_test, gdb_long_test\n tfind tracepoint\n end" "12.4: trace report #4" {
 	    -re "TDP #$tdp6, frame $decimal: char_test = $arg1, long_test = $arg3" {
-		set linecount6 [expr $linecount6 + 1]
+		set linecount6 [expr {$linecount6 + 1}]
 		exp_continue
 	    }
 	    -re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index b018dc696cb..31d976899cd 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -37,12 +37,12 @@ if {$baseline == -1} {
     return
 }
 
-set testline1 [expr $baseline + 4]
-set testline2 [expr $baseline + 5]
-set testline3 [expr $baseline + 6]
-set testline4 [expr $baseline + 7]
-set testline5 [expr $baseline + 8]
-set testline6 [expr $baseline + 9]
+set testline1 [expr {$baseline + 4}]
+set testline2 [expr {$baseline + 5}]
+set testline3 [expr {$baseline + 6}]
+set testline4 [expr {$baseline + 7}]
+set testline5 [expr {$baseline + 8}]
+set testline6 [expr {$baseline + 9}]
 
 #
 # test save-trace command
@@ -53,7 +53,7 @@ set testline6 [expr $baseline + 9]
 gdb_delete_tracepoints
 
 foreach x { 1 2 3 4 5 6 } {
-    set testline [expr \$testline$x]
+    set testline [subst \$testline$x]
     set trcpt [gdb_gettpnum $testline]
     set trcpt$x $trcpt
     gdb_test "passcount $x" \
diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/signal.exp
index 9c63770b1ae..31cd9cd7c27 100644
--- a/gdb/testsuite/gdb.trace/signal.exp
+++ b/gdb/testsuite/gdb.trace/signal.exp
@@ -36,11 +36,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -62,7 +62,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } {
 
 # Start with a fresh gdb.
 clean_restart ${testfile}
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
@@ -153,7 +153,7 @@ with_test_prefix "iterations equals to counter" {
 
 # Record the hit times of each tracepoint in this array.
 array set tracepoint_hits { }
-for { set i $tpnum } { $i < [expr $tpnum + 2] } { incr i } {
+for { set i $tpnum } { $i < $tpnum + 2 } { incr i } {
   set tracepoint_hits($i) 0
 }
 
@@ -162,7 +162,7 @@ while { 1 } {
    set idx 0
    gdb_test_multiple $test $test {
 	-re "Found trace frame $decimal, tracepoint ($decimal).*\r\n$gdb_prompt $" {
-	    set idx [expr $expect_out(1,string)]
+	    set idx [expr {$expect_out(1,string)}]
 	    incr tracepoint_hits($idx)
 	}
        -re "Target failed to find requested trace frame\..*\r\n$gdb_prompt $" {
@@ -176,7 +176,7 @@ while { 1 } {
 
 # Step 3, check the number of collections on each tracepoint.
 
-for { set i $tpnum } { $i < [expr $tpnum + 2] } { incr i } {
+for { set i $tpnum } { $i < $tpnum + 2 } { incr i } {
 
     if { $tracepoint_hits($i) == $iterations } {
 	pass "tracepoint $i hit $iterations times"
diff --git a/gdb/testsuite/gdb.trace/status-stop.exp b/gdb/testsuite/gdb.trace/status-stop.exp
index 1762d30282e..a390dd926af 100644
--- a/gdb/testsuite/gdb.trace/status-stop.exp
+++ b/gdb/testsuite/gdb.trace/status-stop.exp
@@ -19,16 +19,16 @@ set executable $testfile
 set expfile $testfile.exp
 
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-        {debug nowarnings}] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 {debug nowarnings}]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -42,7 +42,7 @@ proc test_tstart_tstop_tstart { } {
 
 	# Start with a fresh gdb.
 	clean_restart ${executable}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -70,7 +70,7 @@ proc test_tstart_tstart { } {
 
 	# Start with a fresh gdb.
 	clean_restart ${executable}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -96,7 +96,7 @@ proc test_buffer_full_tstart { } {
 
 	# Start with a fresh gdb.
 	clean_restart ${executable}
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 90923c1b45e..96ef4de94cc 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -45,7 +45,7 @@ proc strace_remove_socket { action } {
     # Restart with a fresh gdb.
     clean_restart $executable
     gdb_load_shlib $libipa
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -130,7 +130,7 @@ proc strace_info_marker { } {
 	# Restart with a fresh gdb.
 	clean_restart $executable
 	gdb_load_shlib $libipa
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -166,7 +166,7 @@ proc strace_probe_marker { } {
 	# Restart with a fresh gdb.
 	clean_restart $executable
 	gdb_load_shlib $libipa
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -205,7 +205,7 @@ proc strace_trace_on_same_addr { type } {
 	# Restart with a fresh gdb.
 	clean_restart $executable
 	gdb_load_shlib $libipa
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -241,7 +241,7 @@ proc strace_trace_on_same_addr { type } {
 		pass $test
 	    }
 	    -re ".*\r\n$gdb_prompt $" {
-		if [string equal $type "ftrace"] {
+		if {[string equal $type "ftrace"]} {
 		    # The instruction may be not long enough to set a fast
 		    # tracepoint.  Skip the rest of this test.
 		    return -1
@@ -256,7 +256,7 @@ proc strace_trace_on_same_addr { type } {
 		pass $test
 	    }
 	    -re ".*\r\n$gdb_prompt $" {
-		if [string equal $type "ftrace"] {
+		if {[string equal $type "ftrace"]} {
 		    # The instruction may be not long enough to set a fast
 		    # tracepoint.  Skip the rest of this test.
 		    return -1
@@ -268,7 +268,7 @@ proc strace_trace_on_same_addr { type } {
 
 	gdb_breakpoint "end" qualified
 
-	if [string equal $type "break"] {
+	if {[string equal $type "break"]} {
 	    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \
 		"continue to bar"
 	    gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \
@@ -308,7 +308,7 @@ proc strace_trace_on_diff_addr { } {
 	# Restart with a fresh gdb.
 	clean_restart $executable
 	gdb_load_shlib $libipa
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
@@ -367,7 +367,7 @@ if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
 
 clean_restart $executable
 gdb_load_shlib $libipa
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 if {![gdb_target_supports_trace]} {
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 92386e410b1..53e97be5e57 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -75,11 +75,11 @@ if {$baseline == -1} {
     return
 }
 
-set testline1 [expr $baseline + 1]
-set testline2 [expr $baseline + 5]
-set testline3 [expr $baseline + 6]
-set testline4 [expr $baseline + 7]
-set testline5 [expr $baseline + 8]
+set testline1 [expr {$baseline + 1}]
+set testline2 [expr {$baseline + 5}]
+set testline3 [expr {$baseline + 6}]
+set testline4 [expr {$baseline + 7}]
+set testline5 [expr {$baseline + 8}]
 
 #
 # test tfind command
@@ -351,7 +351,7 @@ gdb_test "tfind line NoSuChFiLe.c:$baseline" \
 	"No source file named.*" \
 	"8.27: tfind line in bad source file"
 
-# 8.32 tfind invalid subcommand (tfind foo) 
+# 8.32 tfind invalid subcommand (tfind foo)
 ## check error
 gdb_test "tfind NoSuChOpTiOn 21" \
 	"No symbol.*|\[Ww\]arning.*|\[Ee\]rror.*" \
diff --git a/gdb/testsuite/gdb.trace/trace-break.exp b/gdb/testsuite/gdb.trace/trace-break.exp
index 659267fbb8c..a2a79d848a0 100644
--- a/gdb/testsuite/gdb.trace/trace-break.exp
+++ b/gdb/testsuite/gdb.trace/trace-break.exp
@@ -23,16 +23,16 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 require gdb_trace_common_supports_arch
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	[list debug $additional_flags]] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 [list debug $additional_flags]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -47,7 +47,7 @@ proc break_trace_same_addr_1 { trace_type option } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -81,7 +81,7 @@ proc break_trace_same_addr_2 { trace_type1 trace_type2 option } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -119,7 +119,7 @@ proc break_trace_same_addr_3 { trace_type option } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -156,7 +156,7 @@ proc break_trace_same_addr_4 { trace_type option } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -199,7 +199,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -222,7 +222,7 @@ proc break_trace_same_addr_5 { trace1 trace2 trace3 trace3_at_first_loc } \
     gdb_test "continue" "Continuing\\.\[ \r\n\]+(Thread .* hit )?Breakpoint.*" \
 	"continue to marker"
 
-    if [string equal $trace3_at_first_loc "1"] {
+    if {[string equal $trace3_at_first_loc "1"]} {
 	gdb_test "${trace3} set_point" "\(Fast t|T\)racepoint \[0-9\] at $hex: file.*" \
 	    "${trace3} set_point 2"
     } else {
@@ -272,7 +272,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
 
     # Start with a fresh gdb.
     clean_restart ${executable}
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -300,7 +300,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
     gdb_test_no_output "tstop"
 
 
-    if [string equal $enable1 "enable"] {
+    if {[string equal $enable1 "enable"]} {
 	gdb_test "tfind tracepoint 4" "Found trace frame \[0-9\], tracepoint .*" \
 	    "tfind test frame of tracepoint 4"
 	gdb_test "tdump" \
@@ -313,7 +313,7 @@ proc break_trace_same_addr_6 { trace1 enable1 trace2 enable2 } \
 	    "tfind test frame of tracepoint 4"
     }
 
-    if [string equal $enable2 "enable"] {
+    if {[string equal $enable2 "enable"]} {
 	gdb_test "tfind tracepoint 5" "Found trace frame \[0-9\], tracepoint .*" \
 	    "tfind test frame of tracepoint 5"
 	gdb_test "tdump" \
@@ -359,7 +359,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 }
 clean_restart ${executable}
 
-if ![runto_main] {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
index 7fe814e08d6..153439fffe4 100644
--- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp
+++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp
@@ -17,16 +17,16 @@ load_lib "trace-support.exp"
 
 standard_testfile
 
-if [prepare_for_testing "failed to prepare" $testfile $srcfile \
-        {debug nowarnings}] {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
+	 {debug nowarnings}]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/trace-condition.exp b/gdb/testsuite/gdb.trace/trace-condition.exp
index 8251345a211..0463656fc5c 100644
--- a/gdb/testsuite/gdb.trace/trace-condition.exp
+++ b/gdb/testsuite/gdb.trace/trace-condition.exp
@@ -25,16 +25,16 @@ set additional_flags [gdb_target_symbol_prefix_flags]
 
 require gdb_trace_common_supports_arch
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	[list debug $additional_flags]] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 [list debug $additional_flags]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -55,7 +55,7 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 
 clean_restart ${executable}
 
-if ![runto_main] {
+if {![runto_main]} {
     return 0
 }
 
@@ -69,7 +69,7 @@ proc test_tracepoints { trace_command condition num_frames { kfail_proc 0 } } {
 
     clean_restart ${executable}
 
-    if ![runto_main] {
+    if {![runto_main]} {
 	return 0
     }
 
diff --git a/gdb/testsuite/gdb.trace/trace-enable-disable.exp b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
index c009cfffeae..92d664bfdbe 100644
--- a/gdb/testsuite/gdb.trace/trace-enable-disable.exp
+++ b/gdb/testsuite/gdb.trace/trace-enable-disable.exp
@@ -32,11 +32,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
 
 clean_restart ${testfile}
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
@@ -64,7 +64,7 @@ proc test_tracepoint_enable_disable { tracepoint_cmd } {
 
 	set expected 0
 
-	if ![runto_main] {
+	if {![runto_main]} {
 	    return -1
 	}
 
diff --git a/gdb/testsuite/gdb.trace/trace-mt.exp b/gdb/testsuite/gdb.trace/trace-mt.exp
index 092dc6d9578..ec6eaed32fd 100644
--- a/gdb/testsuite/gdb.trace/trace-mt.exp
+++ b/gdb/testsuite/gdb.trace/trace-mt.exp
@@ -27,11 +27,11 @@ with_test_prefix "runtime trace support check" {
 	return
     }
 
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
-    if ![gdb_target_supports_trace] {
+    if {![gdb_target_supports_trace]} {
 	unsupported "target does not support trace"
 	return -1
     }
@@ -47,7 +47,7 @@ proc step_over_tracepoint { testfile trace_type } \
 
     # Make sure inferior is running in all-stop mode.
     gdb_test_no_output "set non-stop 0"
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -70,7 +70,7 @@ proc break_trace_same_addr { testfile trace_type option } \
 
     # Start with a fresh gdb.
     clean_restart $testfile
-    if ![runto_main] {
+    if {![runto_main]} {
 	return -1
     }
 
@@ -114,7 +114,7 @@ if { [prepare_for_testing "prepare for testing" $testfile_ipa $srcfile \
     return
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return 0
 }
 
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 6e67de11668..275772bd9f6 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -36,8 +36,8 @@ if {$baseline == -1} {
     return
 }
 
-set testline1 [expr $baseline + 1]
-set testline2 [expr $baseline + 3]
+set testline1 [expr {$baseline + 1}]
+set testline2 [expr {$baseline + 3}]
 
 #
 # test "help tracepoints"
@@ -45,7 +45,7 @@ set testline2 [expr $baseline + 3]
 
 set helpcnt 0
 test_class_help "tracepoints" {
-    "Tracing of program execution without stopping the program\.[\r\n\]+" 
+    "Tracing of program execution without stopping the program\.[\r\n\]+"
 } {} "1.0: help tracepoints"
 
 #
diff --git a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
index f61115eaee0..5f9159cdb3e 100644
--- a/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
+++ b/gdb/testsuite/gdb.trace/tracefile-pseudo-reg.exp
@@ -23,11 +23,11 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index be7f37e2e36..2578c9e680e 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -18,7 +18,7 @@ load_lib "trace-support.exp"
 require allow_shlib_tests
 
 # Do not run if gdbserver debug is enabled - the output file is many Gb.
-if [gdbserver_debug_enabled] {
+if {[gdbserver_debug_enabled]} {
     return 0
 }
 
@@ -33,11 +33,11 @@ if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable $options] != ""
 
 clean_restart ${testfile}
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index f5547aa60dc..2b4aa5a0c6a 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -20,16 +20,16 @@ set expfile tstatus.exp
 
 require gdb_trace_common_supports_arch
 
-if [prepare_for_testing "failed to prepare" $executable $srcfile \
-	[list debug]] {
+if {[prepare_for_testing "failed to prepare" $executable $srcfile \
+	 [list debug]]} {
     return -1
 }
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 837633d083b..3fe68670b5c 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -201,7 +201,7 @@ if {![runto_main]} {
 
 # If there are predefined TSVs, test these predefined TSVs are correctly
 # uploaded.
-if [target_info exists gdb,predefined_tsv] {
+if {[target_info exists gdb,predefined_tsv]} {
     set tsv [target_info gdb,predefined_tsv]
 
     # Test predefined TSVs are uploaded.
diff --git a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
index 3adf24afe15..e62a539df5b 100644
--- a/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
+++ b/gdb/testsuite/gdb.trace/unavailable-dwarf-piece.exp
@@ -294,11 +294,11 @@ if  { [gdb_compile [list ${binfile}1.o ${binfile}2.o] ${binfile} \
 
 clean_restart ${testfile}
 
-if ![runto_main] {
+if {![runto_main]} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 51532c9a494..9d4955f5f82 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -302,12 +302,12 @@ proc gdb_unavailable_registers_test_1 { } {
 
     # Test reading uncollected pseudo-registers.  The set of which
     # depends on target.
-    if [is_amd64_regs_target] {
+    if {[is_amd64_regs_target]} {
 	# Check the raw register first.
 	test_register_unavailable "\$rax"
 	test_register_unavailable "\$eax"
 	test_register_unavailable "\$ax"
-    } elseif [is_x86_like_target] {
+    } elseif {[is_x86_like_target]} {
 	# Check the raw register first.
 	test_register_unavailable "\$eax"
 	test_register_unavailable "\$ax"
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 0dbff181972..5a082a3ff23 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -105,7 +105,7 @@ if {[gdb_test "" "Breakpoint .*" "run to main"] != 0} {
     return -1
 }
 
-if ![gdb_target_supports_trace] {
+if {![gdb_target_supports_trace]} {
     unsupported "target does not support trace"
     return -1
 }
-- 
2.47.3