diff options
author | Ben Elliston <bje@gnu.org> | 2018-12-06 18:05:05 +1100 |
---|---|---|
committer | Ben Elliston <bje@gnu.org> | 2018-12-06 18:05:05 +1100 |
commit | d439887f64b9c7c146d9a9062b459d08c43f2a12 (patch) | |
tree | 2a2921cdef799eb805e6ec027ed258bbf72deec3 /baseboards | |
parent | a8e4dbd2a65255a1470962994b2888fc8ee3b9bc (diff) | |
download | dejagnu-d439887f64b9c7c146d9a9062b459d08c43f2a12.zip dejagnu-d439887f64b9c7c146d9a9062b459d08c43f2a12.tar.gz dejagnu-d439887f64b9c7c146d9a9062b459d08c43f2a12.tar.bz2 |
* runtest.exp: Replace [string match] commands involving literal
strings and variables known to not be Tcl glob patterns with eq
and ne.
* config/unix.exp: Likewise.
* lib/debugger.exp: Likewise.
* lib/dg.exp: Likewise.
* lib/framework.exp: Likewise.
* lib/remote.exp: Likewise.
* lib/utils.exp: Likewise.
* baseboards/androideabi.exp: Likewise.
* baseboards/multi-sim.exp: Likewise.
* testsuite/lib/util-defs.exp: Likewise.
* testsuite/runtest.all/config.test: Likewise.
Diffstat (limited to 'baseboards')
-rw-r--r-- | baseboards/androideabi.exp | 2 | ||||
-rw-r--r-- | baseboards/multi-sim.exp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/baseboards/androideabi.exp b/baseboards/androideabi.exp index 950a2fb..dfc25db 100644 --- a/baseboards/androideabi.exp +++ b/baseboards/androideabi.exp @@ -101,7 +101,7 @@ proc adb_load { dest prog args } { set status [lindex $status 0] verbose -log "Executed $prog, status $status" 2 - if {![string match "" $output]} { + if {$output ne ""} { verbose -log -- "$output" 2 } if { $status == 0 } { diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp index ede174f..97801f7 100644 --- a/baseboards/multi-sim.exp +++ b/baseboards/multi-sim.exp @@ -78,23 +78,23 @@ proc rpath_flags { args } { # libraries, if testing a built but not installed compiler it will not # find libraries like libstdc++.so or libgfortran.so so we add the # extra hack/search so it can work. - if {[string match "." $rpathdir]} { - if {[string match $i "libstdc++.so"]} { + if {$rpathdir eq "."} { + if {$i eq "libstdc++.so"} { if {[file exists "$gccpath/libstdc++-v3/src/.libs/libstdc++.so"]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libstdc++-v3/src/.libs" } } - if {[string match $i "libgfortran.so"]} { + if {$i eq "libgfortran.so"} { if {[file exists "$gccpath/libgfortran/.libs/libgfortran.so"]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgfortran/.libs" } } - if {[string match $i "libatomic.so"]} { + if {$i eq "libatomic.so"} { if {[file exists "$gccpath/libatomic/.libs/libatomic.so"]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libatomic/.libs" } } - if {[string match $i "libgomp.so"]} { + if {$i eq "libgomp.so"} { if {[file exists "$gccpath/libgomp/.libs/libgomp.so"]} { set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgomp/.libs" } |