From e4b227ddf4c1ba709a5a364f826ca046f712b417 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 20 Oct 2019 11:54:21 +0100 Subject: [PATCH] tests: Break out test-common.tcl No functional change. Signed-off-by: Ian Jackson --- stest/common.tcl | 16 ++-------------- test-common.tcl | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 test-common.tcl 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 +} -- 2.30.2