chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make-secnet-sites: Fix error handling if caller is in wrong group
[secnet.git]
/
mtest
/
common.tcl
diff --git
a/mtest/common.tcl
b/mtest/common.tcl
index a016dae85fd35b3fb13d3f8c994865873210000e..b436a47f7157dbe9b0c941a23a796b0bda1e29b3 100644
(file)
--- a/
mtest/common.tcl
+++ b/
mtest/common.tcl
@@
-10,17
+10,19
@@
proc mss-program {} {
}
proc run-mss-userv {user group args} {
}
proc run-mss-userv {user group args} {
- eval [list exec env USERV_USER=$user USERV_GROUP=$group] \
+ eval [list
pr
exec env USERV_USER=$user USERV_GROUP=$group] \
[mss-program] \
$args
}
[mss-program] \
$args
}
-proc run-mss {args} { eval [list exec] [mss-program] $args }
+proc run-mss {args} { eval [list
pr
exec] [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 "
exec bash -c "
- diff -u <(
$seddery $a
) \\
- <(
$seddery $b
)
+ diff -u <(
<$a $seddery
) \\
+ <(
<$b $sedderyb
)
"
}
"
}