1 files changed, 6 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
index 3a11d7f..b633cf2 100644
--- a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
+++ b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
@@ -18,7 +18,7 @@
 # Some targets can't call functions, so don't even bother with this
 # test.
 
-if [target_info exists gdb,cannot_call_functions] {
+if {[target_info exists gdb,cannot_call_functions]} {
     unsupported "this target can not call functions"
     continue
 }
@@ -28,7 +28,7 @@ set float_types { tf td tld }
 set complex_types { tfc tdc tldc }
 
 set compile_flags {debug}
-if [support_complex_tests] {
+if {[support_complex_tests]} {
     lappend compile_flags "additional_flags=-DTEST_COMPLEX"
     lappend compile_flags "additional_flags=-Wno-psabi"
 }
@@ -81,7 +81,8 @@ proc start_nested_structs_test { lang types } {
     }
 
     # Start with a fresh gdb.
-    clean_restart ${binfile}
+    clean_restart
+    gdb_load $binfile
 
     # Make certain that the output is consistent
     gdb_test_no_output "set print sevenbit-strings"
@@ -91,7 +92,7 @@ proc start_nested_structs_test { lang types } {
     gdb_test_no_output "set print elements 300"
 
     # Advance to main
-    if { ![runto_main] } then {
+    if { ![runto_main] } {
 	return 0
     }
 
@@ -163,7 +164,7 @@ foreach ta $int_types {
     start_gdb_and_run_tests $lang $ta
 }
 
-if [support_complex_tests] {
+if {[support_complex_tests]} {
     foreach ta $complex_types {
 	start_gdb_and_run_tests $lang $ta
     }