aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2006-05-23 02:43:22 +0000
committerBen Elliston <bje@gnu.org>2006-05-23 02:43:22 +0000
commit7f62e93865c3061a754313c8cb8137c8389c0ce8 (patch)
tree217c51fca973e4cf05a32b88fb45bd60836dc82b /config
parent459573046abde19dc73ec156a739490208af8e81 (diff)
downloaddejagnu-7f62e93865c3061a754313c8cb8137c8389c0ce8.zip
dejagnu-7f62e93865c3061a754313c8cb8137c8389c0ce8.tar.gz
dejagnu-7f62e93865c3061a754313c8cb8137c8389c0ce8.tar.bz2
* config/gdb-comm.exp (gdb_comm_load): Brace some expressions.
* config/i960.exp (i960_spawn): Initialise status. * config/netware.exp (${board}_init): Brace some if expressions. * lib/dg.exp (dg-test): Brace some expressions. * lib/framework.exp (clone_output, log_and_exit, log_summary, record_test, pass, fail): Likewise. * lib/libgloss.exp (get_multilibs): Likewise. * lib/remote.exp (standard_transmit, unix_clean_filename, remote_load, check_for_board_status, remote_expect): Likewise. * lib/rsh.exp (rsh_exec): Likewise.
Diffstat (limited to 'config')
-rw-r--r--config/gdb-comm.exp4
-rw-r--r--config/i960.exp1
-rw-r--r--config/netware.exp8
3 files changed, 9 insertions, 4 deletions
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index 92af199..b7dbfc3 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -292,8 +292,8 @@ proc gdb_comm_load { dest prog args } {
}
-re "$gdb_prompt" { }
}
- set dataoff [format 0x%x [expr $dataoff + $textoff]]
- set bssoff [format 0x%x [expr $bssoff + $textoff]]
+ set dataoff [format 0x%x [expr {$dataoff + $textoff}]]
+ set bssoff [format 0x%x [expr {$bssoff + $textoff}]]
remote_send host "sect .data $dataoff\n"
remote_expect host 10 {
-re "$gdb_prompt" { }
diff --git a/config/i960.exp b/config/i960.exp
index 18810d4..7396c05 100644
--- a/config/i960.exp
+++ b/config/i960.exp
@@ -149,6 +149,7 @@ proc i960_spawn { dest prog args } {
proc i960_wait { dest timeout } {
set output ""
set shell_prompt [board_info $dest shell_prompt]
+ set status -1
remote_expect $dest $timeout {
-re " fault at \[0-9a-h\]+, subtype \[0-9a-h\]+" {
diff --git a/config/netware.exp b/config/netware.exp
index 922fc39..183ba53 100644
--- a/config/netware.exp
+++ b/config/netware.exp
@@ -28,6 +28,8 @@ load_lib remote.exp
proc ${board}_init { args } {
global NLMCONV
+
+ # FIXME: rootme is undefined.
if {![info exists NLMCONV]} then {
set NLMCONV [findfile "$rootme/../binutils/nlmconv"]
}
@@ -43,7 +45,7 @@ proc ${board}_init { args } {
} else {
set passwd ""
}
- if $shell_id<0 then {
+ if {$shell_id < 0} then {
warning "Couldn't connect to target"
return -1
}
@@ -102,7 +104,7 @@ proc ${board}_load { dest prog args } {
set output ""
- if $shell_id<0 then {
+ if {$shell_id < 0} then {
verbose -log "$prog not executed because there is no target" 3
return "untested"
}
@@ -112,6 +114,8 @@ proc ${board}_load { dest prog args } {
# We can't blindly append a suffix to the object name, because the
# result may not be valid on netware's 8.3 filesystem.
+ #
+ # FIXME: tmpdir is undefined.
set nlm "$tmpdir/x.nlm"
set lnk "$tmpdir/x.lnk"