From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 20 Oct 2019 10:54:21 +0000 (+0100)
Subject: tests: Break out test-common.tcl
X-Git-Tag: v0.5.0~68
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;ds=sidebyside;h=e4b227ddf4c1ba709a5a364f826ca046f712b417;hp=b632301269fd51d64d3a334ad933578345e14182;p=secnet.git

tests: Break out test-common.tcl

No functional change.

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

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 /
diff --git a/test-common.tcl b/test-common.tcl
new file mode 100644
index 0000000..2e70f08
--- /dev/null
+++ b/test-common.tcl
@@ -0,0 +1,15 @@
+
+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
+}