mtest: diff: Write output files and seddery rune

[secnet.git] / mtest / common.tcl

diff --git a/mtest/common.tcl b/mtest/common.tcl
index 4fc27e7fff590dfd06a74ba85b470e30aef3ed18..fb9351744825f04f99c1be0de56508e4b983883d 100644 (file)
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -17,9 +17,25 @@ proc run-mss-userv {user group args} {
 
 proc run-mss {args} { eval [list exec] [mss-program] $args }
 
+proc diff {a b seddery} {
+    puts "$a $b $seddery"
+    exec bash -c "
+       diff -u <($seddery $a) \\
+               <($seddery $b)
+    "
+}
+
+proc diff-output {expected got suffix} {
+    global seddery
+    global tmp
+    diff mtest/$expected$suffix $tmp/$got$suffix $seddery
+}
+
 file mkdir $tmp/groupfiles
 
 set env(PYTHONHASHSEED) 0
 set env(PYTHONBYTECODEBASE) 0
 
+set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
+
 prefix_some_path PYTHONPATH .