chiark / gitweb /
tests: Break out test-common.tcl
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 20 Oct 2019 10:54:21 +0000 (11:54 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 24 Oct 2019 18:16:15 +0000 (19:16 +0100)
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
stest/common.tcl
test-common.tcl [new file with mode: 0644]

index 492e146e77e57037f2cd72ceafca9109fb2ad4e1..21ed960138f1b9a99cb98e388d6eba2cc2d20c63 100644 (file)
@@ -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 (file)
index 0000000..2e70f08
--- /dev/null
@@ -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
+}