subdirmk: main.mk: clear SUBDIRMK_MAKEFILES MAKEFILE_TEMPLATES

[secnet.git] / test-common.tcl

diff --git a/test-common.tcl b/test-common.tcl
index 47b867df3c74b7f7b77132df7060dbdb69336e94..45bddcea9dbf325f183c837b60252a6619633ed7 100644 (file)
--- 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 {^stest/t-} $argv0 {stest/d-} tmp]} {
+}]} {} elseif {[regsub {^([sm]test)/t-} $argv0 {\1/d-} tmp]} {
     set tmp $builddir/$tmp
     file mkdir $tmp
 }