* 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.
This commit is contained in:
Corinna Vinschen
2007-04-25 11:38:45 +00:00
parent 495443d4ec
commit b7b73cae89
2 changed files with 9 additions and 3 deletions

View File

@ -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> 2007-04-16 Denis Pilat <denis.pilat@st.com>
* gdb.base/setshow.exp: Reset height after having set it to 100. * gdb.base/setshow.exp: Reset height after having set it to 100.

View File

@ -23,7 +23,6 @@ load_lib gdb.exp
# #
proc gdb_target_sim { } { proc gdb_target_sim { } {
global gdb_prompt global gdb_prompt
global exit_status
set target_sim_options "[board_info target gdb,target_sim_options]"; set target_sim_options "[board_info target gdb,target_sim_options]";
@ -37,11 +36,12 @@ proc gdb_target_sim { } {
timeout { timeout {
perror "Couldn't set target for simulator." perror "Couldn't set target for simulator."
cleanup cleanup
exit $exit_status return -1
} }
} }
set timeout 10 set timeout 10
verbose "Timeout is now $timeout seconds" 2 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 } if [gdb_file_cmd $arg] then { return -1 }
} }
gdb_target_sim if [gdb_target_sim] then { return -1 }
send_gdb "load\n" send_gdb "load\n"
set timeout 2400 set timeout 2400