* config/sim.exp (gdb_target_sim): Just return with -1 when setting

	target sim fails.  Return 0 otherwise.
	(gdb_load): Return prematurely if gdb_target_sim fails.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f6990f0..57c7041 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-25  Corinna Vinschen <vinschen@redhat.com>
+
+       * config/sim.exp (gdb_target_sim): Just return with -1 when setting
+       target sim fails.  Return 0 otherwise.
+       (gdb_load): Return prematurely if gdb_target_sim fails.
+
 2007-04-16  Denis Pilat  <denis.pilat@st.com>
 
        * gdb.base/setshow.exp: Reset height after having set it to 100.

diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp
index 9b6a226..83c96e0 100644 (file)
--- a/gdb/testsuite/config/sim.exp
+++ b/gdb/testsuite/config/sim.exp
@@ -23,7 +23,6 @@ load_lib gdb.exp
 #
 proc gdb_target_sim { } {
     global gdb_prompt
-    global exit_status
     
     set target_sim_options "[board_info target gdb,target_sim_options]";
 
@@ -37,11 +36,12 @@ proc gdb_target_sim { } {
        timeout { 
            perror "Couldn't set target for simulator."
            cleanup
-           exit $exit_status
+           return -1
        }
     }
     set timeout 10
     verbose "Timeout is now $timeout seconds" 2
+    return 0
 }
 
 #
@@ -59,7 +59,7 @@ proc gdb_load { arg } {
        if [gdb_file_cmd $arg] then { return -1 }
     }
 
-    gdb_target_sim
+    if [gdb_target_sim] then { return -1 }
 
     send_gdb "load\n"
     set timeout 2400