X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=mtest%2Fcommon.tcl;h=b436a47f7157dbe9b0c941a23a796b0bda1e29b3;hb=147b444d6faa9a621e33d653b7a72c29724203c3;hp=a016dae85fd35b3fb13d3f8c994865873210000e;hpb=e19ba584463750301836dc5edd8cf2835fca1542;p=secnet.git diff --git a/mtest/common.tcl b/mtest/common.tcl index a016dae..b436a47 100644 --- a/mtest/common.tcl +++ b/mtest/common.tcl @@ -10,17 +10,19 @@ 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} { +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 <($seddery $a) \\ - <($seddery $b) + diff -u <( <$a $seddery ) \\ + <( <$b $sedderyb ) " }