From df67223e4be99527fbeab66394f52c420d7f88f1 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 8 Mar 2019 10:21:21 +1100 Subject: * runtest.exp (search_and_load_file): Join the directory and filename once using 'file join'. Signed-off-by: Ben Elliston --- runtest.exp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'runtest.exp') diff --git a/runtest.exp b/runtest.exp index bea8f29..c4dd207 100644 --- a/runtest.exp +++ b/runtest.exp @@ -328,18 +328,19 @@ proc search_and_load_file { type filelist dirlist } { foreach dir $dirlist { foreach initfile $filelist { - verbose "Looking for $type $dir/$initfile" 2 - if {[file exists [file join $dir $initfile]]} { + set filename [file join $dir $initfile] + verbose "Looking for $type $filename" 2 + if {[file exists $filename]} { set found 1 set error "" if { $type ne "library file" } { - send_user "Using $dir/$initfile as $type.\n" + send_user "Using $filename as $type.\n" } else { - verbose "Loading $dir/$initfile" + verbose "Loading $filename" } - if {[catch "uplevel #0 source $dir/$initfile" error] == 1} { + if {[catch "uplevel #0 source $filename" error] == 1} { global errorInfo - send_error "ERROR: tcl error sourcing $type $dir/$initfile.\n$error\n" + send_error "ERROR: tcl error sourcing $type $filename.\n$error\n" if {[info exists errorInfo]} { send_error "$errorInfo\n" } -- cgit v1.1