From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 19 Oct 2019 22:19:58 +0000 (+0100)
Subject: stest: Use proper builddir subdir as default tmp
X-Git-Tag: v0.5.0~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=5042178018d32875ecb0b6c8d1a72f14fe95b058

stest: Use proper builddir subdir as default tmp

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

diff --git a/stest/common.tcl b/stest/common.tcl
index 12203aa..492e146 100644
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -163,19 +163,20 @@ proc sendpkt {} {
 	[hbytes h2raw c0[join $p ""]c0]
 }
 
+if {![catch {
+    set builddir $env(STEST_BUILDDIR)
+}]} {} else {
+    set builddir .
+}
+
 if {![catch {
     set tmp $env(AUTOPKGTEST_ARTIACTS)
 }]} {} elseif {![catch {
     set tmp $env(AUTOPKGTEST_TMP)
 }]} {} elseif {[regsub {^stest/t-} $argv0 {stest/d-} tmp]} {
+    set tmp $builddir/$tmp
     file mkdir $tmp
 }
-if {![catch {
-    set builddir $env(STEST_BUILDDIR)
-}]} {} else {
-    set builddir .
-}
-
 set socktmp $tmp/s
 exec mkdir -p -m700 $socktmp
 regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /