From 5042178018d32875ecb0b6c8d1a72f14fe95b058 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 19 Oct 2019 23:19:58 +0100 Subject: [PATCH] stest: Use proper builddir subdir as default tmp Signed-off-by: Ian Jackson --- stest/common.tcl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 / -- 2.30.2