chiark / gitweb /
test-common: Handle mtest correctly too
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 20 Oct 2019 11:02:21 +0000 (12:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 24 Oct 2019 18:16:15 +0000 (19:16 +0100)
The default value for tmp nees to be right for mtest/ too.

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

index 90e5dbf..c9dbd00 100644 (file)
@@ -38,5 +38,5 @@ test-example/sites.conf
 test-example/bogus-setup-request
 build-stamp
 
-stest/d-*
+[sm]test/d-*
 stest/udp-preload.so
index 47b867d..04def33 100644 (file)
@@ -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
 }