X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.tcl;h=162ad3a0b7187bc6c34fb8df841a91a61a3217ff;hb=4a6ee8b677fd7addc97fc0d245f95ddde3b5f8e4;hp=2e70f085f1fba7624598d4baa3038867f9b41a7c;hpb=e4b227ddf4c1ba709a5a364f826ca046f712b417;p=secnet.git

diff --git a/test-common.tcl b/test-common.tcl
index 2e70f08..162ad3a 100644
--- a/test-common.tcl
+++ b/test-common.tcl
@@ -1,6 +1,14 @@
 
+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)
+    set builddir $env(SECNET_TEST_BUILDDIR)
 }]} {} else {
     set builddir .
 }
@@ -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
 }