tests: Break out prefix_some_path

This incidentally fixes a bug: previously, we wrote PRELOAD rather
than LD_PRELOAD in one place, which meant that existing LD_PRELOADs
would be overwritten.  Now they no longer are.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/stest/common.tcl b/stest/common.tcl
index 21ed960138f1b9a99cb98e388d6eba2cc2d20c63..7a4c8930700cf564e5bc4b3ee5252901c4d2e913 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -169,13 +169,7 @@ set socktmp $tmp/s
 exec mkdir -p -m700 $socktmp
 regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /
 
-proc prefix_preload {lib} {
-    global env
-    set l {}
-    catch { set l [split $env(PRELOAD) :] }
-    set l [concat [list $lib] $l]
-    set env(LD_PRELOAD) [join $l :]
-}
+proc prefix_preload {lib} { prefix_some_path LD_PRELOAD $lib }
 
 set env(UDP_PRELOAD_DIR) $socktmp
 prefix_preload $builddir/stest/udp-preload.so

diff --git a/test-common.tcl b/test-common.tcl
index 2e70f085f1fba7624598d4baa3038867f9b41a7c..47b867df3c74b7f7b77132df7060dbdb69336e94 100644 (file)
--- a/test-common.tcl
+++ b/test-common.tcl
@@ -1,4 +1,12 @@
 
+proc prefix_some_path {pathvar entry} {
+    global env
+    set l {}
+    catch { set l [split $env($pathvar) :] }
+    set l [concat [list $entry] $l]
+    set env($pathvar) [join $l :]
+}
+
 if {![catch {
     set builddir $env(STEST_BUILDDIR)
 }]} {} else {