diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/framework.exp | 6 | ||||
-rw-r--r-- | lib/remote.exp | 4 | ||||
-rw-r--r-- | runtest.exp | 4 |
4 files changed, 16 insertions, 7 deletions
@@ -1,5 +1,14 @@ 2018-12-09 Ben Elliston <bje@gnu.org> + * runtest.exp (setup_target_hook): Use 'ne' and not '!='. + (iterate_target_variants_two): Likewise. + * lib/remote.exp (standard_download): Use 'eq' not '=='. + (remote_upload): Likewise. + * lib/framework.exp (open_logs): Likewise. + (is_remote): Likewise. + +2018-12-09 Ben Elliston <bje@gnu.org> + * baseboards/basic-sid.exp, baseboards/basic-sim.exp, baseboards/i386-sid.exp, baseboards/mt-sid.exp, baseboards/sh-sid.exp, config/adb.exp, config/gdb-comm.exp, diff --git a/lib/framework.exp b/lib/framework.exp index bf9823f..5879ea6 100644 --- a/lib/framework.exp +++ b/lib/framework.exp @@ -72,7 +72,7 @@ proc open_logs { } { catch "file delete -force -- $outdir/$tool.log" log_file -a $outdir/$tool.log verbose "Opening log files in $outdir" - if { $tool == "testrun" } { + if { $tool eq "testrun" } { set tool "" } fconfigure $sum_file -buffering line @@ -133,9 +133,9 @@ proc is_remote { board } { set board [lindex [split $board "/"] 0] # Map the host or build back into their short form. - if { [board_info build name] == $board } { + if { [board_info build name] eq $board } { set board "build" - } elseif { [board_info host name] == $board } { + } elseif { [board_info host name] eq $board } { set board "host" } diff --git a/lib/remote.exp b/lib/remote.exp index 0e5bad2..f496845 100644 --- a/lib/remote.exp +++ b/lib/remote.exp @@ -497,7 +497,7 @@ proc standard_download {dest file destfile} { if { $dest ne "" } { set result [rsh_download $dest $file $destfile] - if { $result == $destfile } { + if { $result eq $destfile } { return $orig_destfile } else { return $result @@ -529,7 +529,7 @@ proc remote_upload {dest srcfile args} { } if { ![isremote $dest] } { - if { $destfile eq "" || $srcfile == $destfile } { + if { $destfile eq "" || $srcfile eq $destfile } { return $srcfile } set result [catch "exec cp -p $srcfile $destfile" output] diff --git a/runtest.exp b/runtest.exp index dca60c8..f758b22 100644 --- a/runtest.exp +++ b/runtest.exp @@ -833,7 +833,7 @@ proc setup_target_hook { whole_name name } { if { ![isnative] && ![isremote target] } { global env build_triplet target_triplet - if { (![info exists env(DEJAGNU)]) && ($build_triplet != $target_triplet) } { + if { (![info exists env(DEJAGNU)]) && ($build_triplet ne $target_triplet) } { warning "Assuming target board is the local machine (which is probably wrong).\nYou may need to set your DEJAGNU environment variable." } } @@ -1605,7 +1605,7 @@ proc iterate_target_variants_two { orig_target target variants } { if { [llength $variants] > 1 } { set result [iterate_target_variants_two $orig_target $target [lrange $variants 1 end]] } else { - if { $target != $orig_target } { + if { $target ne $orig_target } { set result [list $target] } else { set result {} |