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 90e5dbf5c770816fa34f386c51682ed965244fe0..c9dbd00d1ed4e75f06df5cddce7b2f9679a9c42d 100644 (file)
--- 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 47b867df3c74b7f7b77132df7060dbdb69336e94..04def333a1690acf1493b545e814019d1721d627 100644 (file)
--- 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
 }