X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=stest%2Fcommon.tcl;h=21ed960138f1b9a99cb98e388d6eba2cc2d20c63;hb=e4b227ddf4c1ba709a5a364f826ca046f712b417;hp=492e146e77e57037f2cd72ceafca9109fb2ad4e1;hpb=b632301269fd51d64d3a334ad933578345e14182;p=secnet.git

diff --git a/stest/common.tcl b/stest/common.tcl
index 492e146..21ed960 100644
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -1,3 +1,5 @@
+source test-common.tcl
+
 package require Tclx
 
 load chiark_tcl_hbytes-1.so
@@ -163,20 +165,6 @@ 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
-}
 set socktmp $tmp/s
 exec mkdir -p -m700 $socktmp
 regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /