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

diff --git a/test-common.tcl b/test-common.tcl
index 04def33..162ad3a 100644
--- a/test-common.tcl
+++ b/test-common.tcl
@@ -8,7 +8,7 @@ proc prefix_some_path {pathvar entry} {
 }
 
 if {![catch {
-    set builddir $env(STEST_BUILDDIR)
+    set builddir $env(SECNET_TEST_BUILDDIR)
 }]} {} else {
     set builddir .
 }
@@ -17,7 +17,7 @@ if {![catch {
     set tmp $env(AUTOPKGTEST_ARTIACTS)
 }]} {} elseif {![catch {
     set tmp $env(AUTOPKGTEST_TMP)
-}]} {} elseif {[regsub {^([sm]test)/t-} $argv0 {\1/d-} tmp]} {
+}]} {} elseif {[regsub {^(?:\./)?([sm]test)/t-} $argv0 {\1/d-} tmp]} {
     set tmp $builddir/$tmp
     file mkdir $tmp
 }