1 files changed, 10 insertions, 9 deletions

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 0b5f863..c275d74 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -29,7 +29,8 @@ if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \
     return -1
 }
 
-clean_restart ${binfile}
+clean_restart
+gdb_load $binfile
 
 
 # Ask GDB to show the current definition of MACRO, and return a list
@@ -43,7 +44,7 @@ clean_restart ${binfile}
 #
 # If GDB complains that it doesn't have any information about
 # preprocessor macro definitions, return the string `no-macro-info'.
-# 
+#
 # If expect times out waiting for GDB, we return the string `timeout'.
 #
 # If GDB's output doesn't otherwise match what we're expecting, we
@@ -207,7 +208,7 @@ if {$macro_support == 0} {
     unsupported "skipping test because debug information does not include macro information."
     return 0
 }
- 
+
 list_and_check_macro main WHERE {macscp1.c {before macscp1_3}}
 list_and_check_macro macscp2_2 WHERE {macscp2.h macscp1.c {before macscp2_2}}
 list_and_check_macro macscp3_2 WHERE {macscp3.h macscp1.c {before macscp3_2}}
@@ -233,10 +234,10 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp2'"
     }
     {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}} {
-        setup_kfail "gdb/7660" *-*-* 
+        setup_kfail "gdb/7660" *-*-*
         fail "info macro WHERE after `list macscp_4_2_from_macscp2' (gdb/7660)"
     }
-    timeout { 
+    timeout {
         fail "info macro WHERE after `list macscp_4_2_from_macscp2' (timeout)"
     }
     default { fail "info macro WHERE after `list macscp_4_2_from_macscp2'" }
@@ -248,7 +249,7 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp3'"
     }
     {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}} {
-        setup_kfail "gdb/7660" *-*-* 
+        setup_kfail "gdb/7660" *-*-*
         fail "info macro WHERE after `list macscp_4_2_from_macscp3' (gdb/7660)"
     }
     timeout {
@@ -359,7 +360,7 @@ for {set i 0} {$i < [llength $funcs]} {incr i} {
     if {[string compare $result $expected] == 0} {
         pass "info macro WHERE stopped in $func"
     } elseif {[string compare $result $kfail_expected] == 0} {
-        setup_kfail "gdb/7660" *-*-* 
+        setup_kfail "gdb/7660" *-*-*
         fail "info macro WHERE stopped in $func (gdb/7660)"
     } elseif {[string compare $result timeout] == 0} {
         fail "info macro WHERE stopped in $func (timeout)"
@@ -392,7 +393,7 @@ for {set i 0} {$i < [llength $funcs]} {incr i} {
                 switch -- [lindex $result end] {
                     undefined { pass $test_name }
                     timeout { fail "$test_name (timeout)" }
-                    default { 
+                    default {
                         maybe_kfail $func "$test_name"
                     }
                 }
@@ -407,7 +408,7 @@ for {set i 0} {$i < [llength $funcs]} {incr i} {
                 switch -- [lindex $result end] {
                     undefined { pass $test_name }
                     timeout { fail "$test_name (timeout)" }
-                    default { 
+                    default {
                         maybe_kfail $func "$test_name"
                     }
                 }