test: Use test/d-* instead of test/tmp for everything

Now it is actually ok to run multiple tests in parallel.

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

diff --git a/.gitignore b/.gitignore
index 6b938a118de19012fbe0cd9379fcb6569542fef3..8db83a40262b725dbe8b7435ca3448daad074f51 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,5 @@ test-example/sites.conf
 test-example/bogus-setup-request
 build-stamp
 
-test/tmp
 test/d-*
 test/udp-preload.so

diff --git a/test/common.tcl b/test/common.tcl
index 59b10baeef34ede637d0588832048172b6055be8..3a2e1ae39194f64d7f46e20f60fd23ab019cdbcd 100644 (file)
--- a/test/common.tcl
+++ b/test/common.tcl
@@ -155,8 +155,14 @@ proc sendpkt {} {
        [hbytes h2raw c0[join $p ""]c0]
 }
 
-file mkdir test/tmp
-set tmp test/tmp
+if {![catch {
+    set tmp $env(AUTOPKGTEST_ARTIACTS)
+}]} {} elseif {![catch {
+    set tmp $env(AUTOPKGTEST_TMP)
+}]} {} elseif {[regsub {^test/t-} $argv0 {test/d-} tmp]} {
+    file mkdir $tmp
+}
+
 set socktmp $tmp/s
 exec mkdir -p -m700 $socktmp
 regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /