mtest: Honour MTEST_PYTHON

[secnet.git] / test-common.tcl

diff --git a/test-common.tcl b/test-common.tcl
index 2e70f085f1fba7624598d4baa3038867f9b41a7c..04def333a1690acf1493b545e814019d1721d627 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 {
@@ -9,7 +17,7 @@ if {![catch {
     set tmp $env(AUTOPKGTEST_ARTIACTS)
 }]} {} elseif {![catch {
     set tmp $env(AUTOPKGTEST_TMP)
-}]} {} elseif {[regsub {^stest/t-} $argv0 {stest/d-} tmp]} {
+}]} {} elseif {[regsub {^([sm]test)/t-} $argv0 {\1/d-} tmp]} {
     set tmp $builddir/$tmp
     file mkdir $tmp
 }