From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 20 Oct 2019 11:02:21 +0000 (+0100)
Subject: test-common: Handle mtest correctly too
X-Git-Tag: v0.5.0~66
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=e68a917bdc09e3d332edbaa171347ddfe1902d59

test-common: Handle mtest correctly too

The default value for tmp nees to be right for mtest/ too.

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

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