* runtest.exp (load_tool_init): Search for tool init file instead

	of assuming exactly one location.

Signed-off-by: Ben Elliston <bje@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index b5480e8..3c96f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-15  Jacob Bachmeyer  <jcb62281@gmail.com>
+
+       * runtest.exp (load_tool_init): Search for tool init file instead
+       of assuming exactly one location.
+
 2018-11-15  Ben Elliston  <bje@gnu.org>
 
        * runtest.exp (load_lib): Whitespace fix.

diff --git a/runtest.exp b/runtest.exp
index c7beeb3..5ced8ab 100644 (file)
--- a/runtest.exp
+++ b/runtest.exp
@@ -929,25 +929,21 @@ proc load_tool_init { file } {
     global srcdir
     global loaded_libs
 
-    if {[info exists loaded_libs($file)]} {
+    if {[info exists loaded_libs(tool/$file)]} {
        return
     }
 
-    set loaded_libs($file) ""
-
-    verbose "Looking for tool init file $srcdir/lib/$file"
+    set loaded_libs(tool/$file) ""
 
-    if {[file exists [file join ${srcdir} lib $file]]} {
-       verbose "Loading library file ${srcdir}/lib/$file"
-       if { [catch "uplevel #0 source ${srcdir}/lib/$file"] == 1 } {
-           send_error "ERROR: tcl error sourcing library file ${srcdir}/lib/$file.\n"
-           global errorInfo
-           if {[info exists errorInfo]} {
-               send_error "$errorInfo\n"
-           }
-           exit 1
-       }
+    if { [lindex [file split $srcdir] end] != "testsuite" } {
+       lappend searchpath [file join $srcdir testsuite lib tool]
+       lappend searchpath [file join $srcdir testsuite lib]
     } else {
+       lappend searchpath [file join $srcdir lib tool]
+    }
+    lappend searchpath [file join $srcdir lib]
+
+    if { ![search_and_load_file "tool init file" [list $file] $searchpath] } {
        warning "Couldn't find tool init file"
     }
 }