6 files changed, 13 insertions, 13 deletions
diff --git a/gdb/testsuite/gdb.opt/break-on-_exit.exp b/gdb/testsuite/gdb.opt/break-on-_exit.exp
index 2b94be8..9295fea 100644
--- a/gdb/testsuite/gdb.opt/break-on-_exit.exp
+++ b/gdb/testsuite/gdb.opt/break-on-_exit.exp
@@ -25,7 +25,7 @@
 # for libc, then the breakpoint is set on the exec-local _exit@plt instead,
 # and that functionality will also not be used.
 #
-# We may get the required setup in case of a libc with misssing separate
+# We may get the required setup in case of a libc with missing separate
 # debuginfo, but we want the same effect if that debuginfo is installed.
 #
 # So, we use -readnever to read minimal symbols, but not non-miminal symbols.
diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp
index d83ff75..0805f69 100644
--- a/gdb/testsuite/gdb.opt/inline-break.exp
+++ b/gdb/testsuite/gdb.opt/inline-break.exp
@@ -209,7 +209,7 @@ foreach_with_prefix cmd [list "break" "tbreak"] {
     # that we actually stop where we think we should.
     for {set i 1} {$i < 4} {incr i} {
 	foreach inline {"not_inline" "inline"} {
-	    eval gdb_breakpoint "${inline}_func$i" $break_flags
+	    gdb_breakpoint "${inline}_func$i" {*}$break_flags
 	}
     }
 
@@ -247,7 +247,7 @@ foreach_with_prefix func {
     "func_inline_caller"
     "func_inline_callee"
 } {
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if {![runto_main]} {
 	continue
@@ -264,7 +264,7 @@ foreach_with_prefix func {
 set line [gdb_get_line_number "break here"]
 
 with_test_prefix "line number" {
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if {![runto_main]} {
 	continue
@@ -288,7 +288,7 @@ with_test_prefix "line number" {
 
 with_test_prefix "address" {
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if {![runto_main]} {
 	continue
@@ -308,7 +308,7 @@ with_test_prefix "address" {
 
 with_test_prefix "check alignment" {
 
-    clean_restart $binfile
+    clean_restart $::testfile
 
     if {![runto_main]} {
 	continue
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index eca897c..4163d8f 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -241,7 +241,7 @@ gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker"
 
 # Some architectures will have one or more instructions after
 # the call instruction which still are part of the call sequence,
-# so it should be expected to return to the caller line after issue 
+# so it should be expected to return to the caller line after issue
 # a 'finish' command.
 gdb_test_multiple "finish" "finish from marker to func1" {
     -re -wrap "func1 \\(\\);" {
@@ -335,7 +335,7 @@ proc mi_cli_step {cli_output_re message} {
 # command run while the top interpreter is MI results in the expected
 # CLI output sent to MI's console.
 with_test_prefix "mi" {
-    if [mi_gdb_start] {
+    if {[mi_gdb_start]} {
 	return
     }
     mi_gdb_load ${binfile}
diff --git a/gdb/testsuite/gdb.opt/inline-entry.exp b/gdb/testsuite/gdb.opt/inline-entry.exp
index f185f10..227131a 100644
--- a/gdb/testsuite/gdb.opt/inline-entry.exp
+++ b/gdb/testsuite/gdb.opt/inline-entry.exp
@@ -33,7 +33,7 @@
 # case where DW_AT_entry_pc is not the first instruction of an inlined
 # function, as can be the case in gcc 8.x with the
 # -gstatement-frontiers work in place.
-require {expr ![is_c_compiler_gcc] || [supports_statement_frontiers]}
+require {expr {![is_c_compiler_gcc] || [supports_statement_frontiers]}}
 
 standard_testfile
 
@@ -43,11 +43,11 @@ if { [supports_statement_frontiers] } {
     lappend options additional_flags=-gstatement-frontiers
 }
 
-if { [prepare_for_testing "failed to prepare" $binfile $srcfile $options] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile $options] } {
     return
 }
 
-if ![runto_main] {
+if { ![runto_main] } {
     return
 }
 
diff --git a/gdb/testsuite/gdb.opt/inline-small-func.exp b/gdb/testsuite/gdb.opt/inline-small-func.exp
index d77a10e..b04f957 100644
--- a/gdb/testsuite/gdb.opt/inline-small-func.exp
+++ b/gdb/testsuite/gdb.opt/inline-small-func.exp
@@ -41,7 +41,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
     return -1
 }
 
-if ![runto_main] {
+if { ![runto_main] } {
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index 4b7ab3a..9c6d6c5 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -34,7 +34,7 @@ if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
   return -1
 }
 
-clean_restart ${binfile}
+clean_restart ${::testfile}
 gdb_load_shlib $binfile_lib
 
 if {![runto_main]} {