diff options
author | Ben Elliston <bje@gnu.org> | 2003-08-07 03:42:42 +0000 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2003-08-07 03:42:42 +0000 |
commit | d7b7156075df25716082174f6baf2ac0e163e939 (patch) | |
tree | e2c4f9afdb89cf1e6f082acf7c1a0aae0fd423a8 /config/sim.exp | |
parent | 8f0d1b58dbfb8b4e7ad5c14f21d65da05a364200 (diff) | |
download | dejagnu-d7b7156075df25716082174f6baf2ac0e163e939.zip dejagnu-d7b7156075df25716082174f6baf2ac0e163e939.tar.gz dejagnu-d7b7156075df25716082174f6baf2ac0e163e939.tar.bz2 |
Strip trailing semicolons from Tcl source files.
Diffstat (limited to 'config/sim.exp')
-rw-r--r-- | config/sim.exp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/config/sim.exp b/config/sim.exp index 2441a7c..3471f27 100644 --- a/config/sim.exp +++ b/config/sim.exp @@ -28,7 +28,7 @@ proc sim_spawn { dest cmdline args } { perror "no simulator defined for [board_info $dest name]" exit 1 } else { - set sim [board_info $dest sim]; + set sim [board_info $dest sim] } if [board_info $dest exists sim,options] { @@ -40,7 +40,7 @@ proc sim_spawn { dest cmdline args } { if ![is_remote host] { if { [which $sim] == 0 } { verbose -log "Simulator $sim missing." 3 - return -1; + return -1 } } @@ -49,15 +49,15 @@ proc sim_spawn { dest cmdline args } { # we're assuming the program is the first word in the command. # FIXME: "prog < infile" won't work until we download infile. set prog [lindex $cmdline 0] - set prog [remote_download host $prog a.out]; + set prog [remote_download host $prog a.out] set cmdline [lreplace $cmdline 0 0 $prog] } - return [eval remote_spawn host \{ $sim $simflags $cmdline \} $args]; + return [eval remote_spawn host \{ $sim $simflags $cmdline \} $args] } proc sim_wait { dest timeout } { - return [remote_wait host $timeout]; + return [remote_wait host $timeout] } proc sim_load { dest prog args } { @@ -71,16 +71,16 @@ proc sim_load { dest prog args } { if ![file exists $prog] then { perror "sim.exp: $prog to be downloaded does not exist." verbose -log "$prog to be downloaded does not exist." 3 - return [list "untested" ""]; + return [list "untested" ""] } if [board_info $dest exists sim_time_limit] { - set sim_time_limit [board_info $dest sim_time_limit]; + set sim_time_limit [board_info $dest sim_time_limit] } else { set sim_time_limit 240 } - set output ""; + set output "" if { [board_info target sim,protocol] == "sid" } { set cmd "-e \"set cpu-loader file [list $prog]\"" @@ -94,21 +94,21 @@ proc sim_load { dest prog args } { # this isn't as nice as limiting the amount of CPU time, it # will have to do. if { $inpfile != "" } { - set res [remote_spawn target "${cmd} < $inpfile" "readonly"]; + set res [remote_spawn target "${cmd} < $inpfile" "readonly"] } else { - set res [remote_spawn target "${cmd}"]; + set res [remote_spawn target "${cmd}"] } if { $res <= 0 } { - return [list "fail" "remote_spawn failed"]; + return [list "fail" "remote_spawn failed"] } - set state [remote_wait target $sim_time_limit]; - set status [lindex $state 0]; - set output [lindex $state 1]; - verbose "Output is $output"; + set state [remote_wait target $sim_time_limit] + set status [lindex $state 0] + set output [lindex $state 1] + verbose "Output is $output" - set status2 [check_for_board_status output]; + set status2 [check_for_board_status output] if { $status2 >= 0 } { set status $status2 } @@ -122,10 +122,10 @@ proc sim_load { dest prog args } { } else { set result "fail" } - return [list $result $output]; + return [list $result $output] } -set_board_info protocol "sim"; +set_board_info protocol "sim" # By default, assume the simulator is slow. This causes some tests # to either be simplified or skipped completely. |