Merge commit 'ff11733b6b7d7920033f81c4669ebba9131b984f' into wip.subdirmk

[secnet.git] / mtest / common.tcl

diff --git a/mtest/common.tcl b/mtest/common.tcl
index 3db8d5caac9741ccbc02a7efb24cdde82d1fb199..e3b67c40a55242d6430266e6bd704d983fff44e9 100644 (file)
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -1,7 +1,12 @@
 source test-common.tcl
 
 proc mss-program {} {
+    global env
     set l ./make-secnet-sites
+    if {![catch { set py $env(MTEST_PYTHON) }]} {
+       set l [concat $py $l]
+    }
+    return $l
 }
 
 proc run-mss-userv {user group args} {
@@ -10,6 +15,22 @@ proc run-mss-userv {user group args} {
         $args
 }
 
+proc run-mss {args} { eval [list exec] [mss-program] $args }
+
+proc diff-output {expected got suffix} {
+    global seddery
+    global tmp
+    exec bash -c "
+       diff -u <($seddery mtest/$expected$suffix) \\
+               <($seddery $tmp/$got$suffix      )
+    "
+}
+
 file mkdir $tmp/groupfiles
 
+set env(PYTHONHASHSEED) 0
+set env(PYTHONBYTECODEBASE) 0
+
+set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
+
 prefix_some_path PYTHONPATH .