From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 12 Oct 2019 21:40:51 +0000 (+0100)
Subject: test: Use test/d-* instead of test/tmp for everything
X-Git-Tag: v0.5.0~92
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f815fb3dfe8b5937784196feda17a3400dc6fe0f;p=secnet.git

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 6b938a1..8db83a4 100644
--- 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 59b10ba..3a2e1ae 100644
--- 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 /