X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=mtest%2Fcommon.tcl;h=b436a47f7157dbe9b0c941a23a796b0bda1e29b3;hb=147b444d6faa9a621e33d653b7a72c29724203c3;hp=e3b67c40a55242d6430266e6bd704d983fff44e9;hpb=48ef5edd35eba43022e8d2ee18fcdd2fa3349762;p=secnet.git

diff --git a/mtest/common.tcl b/mtest/common.tcl
index e3b67c4..b436a47 100644
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -10,20 +10,26 @@ proc mss-program {} {
 }
 
 proc run-mss-userv {user group args} {
-    eval [list exec env USERV_USER=$user USERV_GROUP=$group] \
+    eval [list prexec env USERV_USER=$user USERV_GROUP=$group] \
 	 [mss-program] \
 	 $args
 }
 
-proc run-mss {args} { eval [list exec] [mss-program] $args }
+proc run-mss {args} { eval [list prexec] [mss-program] $args }
+
+proc diff {a b seddery {sedderyb X}} {
+    if {![string compare $sedderyb X]} { set sedderyb $seddery }
+    puts "$a $b $seddery $sedderyb"
+    exec bash -c "
+    	diff -u <( <$a $seddery  ) \\
+        	<( <$b $sedderyb )
+    "
+}
 
 proc diff-output {expected got suffix} {
     global seddery
     global tmp
-    exec bash -c "
-    	diff -u <($seddery mtest/$expected$suffix) \\
-        	<($seddery $tmp/$got$suffix      )
-    "
+    diff mtest/$expected$suffix $tmp/$got$suffix $seddery
 }
 
 file mkdir $tmp/groupfiles