aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2018-11-30 12:18:54 +1100
committerBen Elliston <bje@gnu.org>2018-11-30 12:18:54 +1100
commit88486ad34305e2b6c9cd7f5e0efa65b709d30587 (patch)
tree3cf71534bba4823dbef8359bda9b4d170dbe63f3 /lib
parent12028b93c50d35b79fd73860eb6d011b00a6d11c (diff)
downloaddejagnu-88486ad34305e2b6c9cd7f5e0efa65b709d30587.zip
dejagnu-88486ad34305e2b6c9cd7f5e0efa65b709d30587.tar.gz
dejagnu-88486ad34305e2b6c9cd7f5e0efa65b709d30587.tar.bz2
* runtest.exp: Use isremote.
* lib/target.exp: Likewise. * lib/remote.exp: Likewise. * lib/libgloss.exp: Likewise. * config/unix.exp: Likewise. * config/sim.exp: Likewise. * config/gdb_stub.exp: Likewise. * config/gdb-comm.exp: Likewise. * baseboards/basic-sim.exp: Likewise. * baseboards/androideabi.exp: Likewise.
Diffstat (limited to 'lib')
-rw-r--r--lib/libgloss.exp42
-rw-r--r--lib/remote.exp18
-rw-r--r--lib/target.exp18
3 files changed, 39 insertions, 39 deletions
diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 3ce1d09..c36630c 100644
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -35,7 +35,7 @@ proc libgloss_link_flags { args } {
# if we're on a remote host, we can't search for the file, so we can only
# use an installed compiler, so we don't add any paths here.
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -115,7 +115,7 @@ proc newlib_link_flags { args } {
# if we're on a remote host, we can't search for the file, so we can only
# use an installed compiler, so we don't add any paths here.
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -145,7 +145,7 @@ proc newlib_include_flags { args } {
return ""
}
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -174,7 +174,7 @@ proc libio_include_flags { args } {
global srcdir
global tool_root_dir
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -208,7 +208,7 @@ proc libio_include_flags { args } {
}
proc libio_link_flags { args } {
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -226,7 +226,7 @@ proc g++_include_flags { args } {
global srcdir
global target_alias
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -318,7 +318,7 @@ proc libstdc++_include_flags { args } {
global srcdir
global target_alias
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -397,7 +397,7 @@ proc get_multilibs { args } {
# if we're on a remote host, we can't search for the file, so we can only
# use an installed compiler, so we don't add any paths here.
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -605,7 +605,7 @@ proc get_multilibs { args } {
proc find_binutils_prog { name } {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir $name]
if { $file == "" } {
@@ -631,7 +631,7 @@ proc find_binutils_prog { name } {
proc find_gcc {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir xgcc]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/xgcc]
@@ -650,7 +650,7 @@ proc find_gcc {} {
proc find_gcj {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir gcj]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/gcj]
@@ -669,7 +669,7 @@ proc find_gcj {} {
proc find_g++ {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir xg++]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/xg++]
@@ -691,7 +691,7 @@ proc find_g++ {} {
proc find_gdc {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir gdc]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/gdc]
@@ -710,7 +710,7 @@ proc find_gdc {} {
proc find_g77 {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir g77]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/g77]
@@ -729,7 +729,7 @@ proc find_g77 {} {
proc find_gfortran {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir gfortran]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/gfortran]
@@ -748,7 +748,7 @@ proc find_gfortran {} {
proc find_gnatmake {} {
global tool_root_dir
- if {![is_remote host]} {
+ if {![isremote host]} {
set file [lookfor_file $tool_root_dir gnatmake]
if { $file == "" } {
set file [lookfor_file $tool_root_dir gcc/gnatmake]
@@ -769,7 +769,7 @@ proc find_nm {} {
global tool_root_dir
set NM ""
- if {![is_remote host]} {
+ if {![isremote host]} {
set NM [lookfor_file $tool_root_dir nm-new]
if {$NM == ""} {
set NM [lookfor_file $tool_root_dir binutils/nm-new]
@@ -867,7 +867,7 @@ proc find_gas { } {
set AS ""
- if {![is_remote host]} {
+ if {![isremote host]} {
set AS [lookfor_file $tool_root_dir as-new]
if { $AS == "" } {
set AS [lookfor_file $tool_root_dir gas/as-new]
@@ -884,7 +884,7 @@ proc find_ld { } {
set LD ""
- if {![is_remote host]} {
+ if {![isremote host]} {
set LD [lookfor_file $tool_root_dir ld-new]
if { $LD == "" } {
set LD [lookfor_file $tool_root_dir ld/ld-new]
@@ -935,7 +935,7 @@ proc winsup_include_flags { args } {
return ""
}
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
@@ -965,7 +965,7 @@ proc winsup_link_flags { args } {
# if we're on a remote host, we can't search for the file, so we can only
# use an installed compiler, so we don't add any paths here.
- if {[is_remote host]} {
+ if {[isremote host]} {
return ""
}
diff --git a/lib/remote.exp b/lib/remote.exp
index 56b75f2..d8b60a3 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -318,7 +318,7 @@ proc remote_exec { hostname program args } {
verbose -log "Executing on $hostname: $program $pargs $inp $outp (timeout = $timeout)" 2
# Run it locally if appropriate.
- if { ![is_remote $hostname] } {
+ if { ![isremote $hostname] } {
set result [local_exec "$program $pargs" $inp $outp $timeout]
} else {
if { [board_info $hostname exists remotedir] } {
@@ -445,7 +445,7 @@ proc remote_download { dest file args } {
set destfile [file tail $file]
}
- if { ![is_remote $dest] } {
+ if { ![isremote $dest] } {
if { $destfile == "" || $destfile == $file } {
return $file
} else {
@@ -528,7 +528,7 @@ proc remote_upload {dest srcfile args} {
set destfile [file tail $srcfile]
}
- if { ![is_remote $dest] } {
+ if { ![isremote $dest] } {
if { $destfile == "" || $srcfile == $destfile } {
return $srcfile
}
@@ -746,7 +746,7 @@ proc remote_raw_file { dest args } {
proc standard_file { dest op args } {
set file [lindex $args 0]
verbose "dest in proc standard_file is $dest" 3
- if { ![is_remote $dest] } {
+ if { ![isremote $dest] } {
switch -- $op {
cmp {
set otherfile [lindex $args 1]
@@ -851,7 +851,7 @@ proc unix_clean_filename { dest file } {
proc remote_spawn { dest commandline args } {
global board_info
- if {![is_remote $dest]} {
+ if {![isremote $dest]} {
if {[info exists board_info($dest,fileid)]} {
unset board_info($dest,fileid)
}
@@ -959,7 +959,7 @@ proc remote_load { dest prog args } {
set dname [board_info $dest name]
set cache "[getenv REMOTELOAD_CACHE]/$tool/$dname/[file tail $prog]"
- set empty [is_remote $dest]
+ set empty [isremote $dest]
if { [board_info $dest exists is_simulator] || [getenv REMOTELOAD_CACHE] == "" } {
set empty 0
} else {
@@ -977,13 +977,13 @@ proc remote_load { dest prog args } {
if {![target_info exists objcopy]} {
set_currtarget_info objcopy [find_binutils_prog objcopy]
}
- if {[is_remote host]} {
+ if {[isremote host]} {
set dprog [remote_download host $prog "a.out"]
} else {
set dprog $prog
}
set status [remote_exec host "[target_info objcopy]" "-O srec $dprog ${dprog}.sum"]
- if {[is_remote host]} {
+ if {[isremote host]} {
remote_file upload ${dprog}.sum ${prog}.sum
}
if { [lindex $status 0] == 0 } {
@@ -1077,7 +1077,7 @@ proc standard_load { dest prog args } {
return "untested"
}
- if {[is_remote $dest]} {
+ if {[isremote $dest]} {
if {![board_info $dest exists remotedir]} {
set board_info($dest,remotedir) "/tmp/runtest.[pid]"
}
diff --git a/lib/target.exp b/lib/target.exp
index 67655e6..ba6253f 100644
--- a/lib/target.exp
+++ b/lib/target.exp
@@ -495,7 +495,7 @@ proc default_target_compile {source destfile type options} {
}
}
- if {![is_remote host]} {
+ if {![isremote host]} {
if { [which $compiler] == 0 } {
return "default_target_compile: Can't find $compiler."
}
@@ -604,7 +604,7 @@ proc default_target_compile {source destfile type options} {
verbose "doing compile"
set sources ""
- if {[is_remote host]} {
+ if {[isremote host]} {
foreach x $source {
set file [remote_download host $x]
if { $file == "" } {
@@ -618,7 +618,7 @@ proc default_target_compile {source destfile type options} {
set sources $source
}
- if {[is_remote host]} {
+ if {[isremote host]} {
append add_flags " -o a.out"
remote_file host delete a.out
} else {
@@ -636,7 +636,7 @@ proc default_target_compile {source destfile type options} {
set opts "$sources $add_flags"
}
- if {[is_remote host]} {
+ if {[isremote host]} {
if {[host_info exists use_at]} {
set fid [open "atfile" "w"]
puts $fid "$opts"
@@ -661,7 +661,7 @@ proc default_target_compile {source destfile type options} {
}
set compiler_flags $opts
- if {[is_remote host]} {
+ if {[isremote host]} {
remote_upload host a.out $destfile
remote_file host delete a.out
}
@@ -711,14 +711,14 @@ proc default_target_assemble { source destfile flags } {
append flags " $ASFLAGS_FOR_TARGET"
}
- if {[is_remote host]} {
+ if {[isremote host]} {
set source [remote_download host $source]
set dest "a.out"
} else {
set dest $destfile
}
set status [remote_exec host "$AS $source $flags -o $dest"]
- if {[is_remote host]} {
+ if {[isremote host]} {
remote_upload host $dest $destfile
}
@@ -799,7 +799,7 @@ proc default_link { board objects destfile flags } {
append flags " $ldscript"
}
- if {[is_remote host]} {
+ if {[isremote host]} {
set nobjects ""
foreach x $objects {
set nobjects "$nobjects [remote_download host $x]"
@@ -810,7 +810,7 @@ proc default_link { board objects destfile flags } {
set dest $destfile
}
set status [remote_exec host "$LD $objects $flags -o $dest"]
- if {[is_remote host]} {
+ if {[isremote host]} {
remote_upload host $dest $destfile
}