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 12203aa40ddb6bcad7666db95b88441ae43d6156..492e146e77e57037f2cd72ceafca9109fb2ad4e1 100644 (file)
--- 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 /