mtest: Break out mss-run-userv

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/mtest/common.tcl b/mtest/common.tcl
index 6b6b16dcfac7e6f7af2968bad085fb6913480a02..3db8d5caac9741ccbc02a7efb24cdde82d1fb199 100644 (file)
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -1,5 +1,15 @@
 source test-common.tcl
 
+proc mss-program {} {
+    set l ./make-secnet-sites
+}
+
+proc run-mss-userv {user group args} {
+    eval [list exec env USERV_USER=$user USERV_GROUP=$group] \
+        [mss-program] \
+        $args
+}
+
 file mkdir $tmp/groupfiles
 
 prefix_some_path PYTHONPATH .

diff --git a/mtest/t-userv b/mtest/t-userv
index 1e5ea25351d655db696327986c5edd7e31230293..c1552bc5b63336302cbdfaa2c9e3cdf7d595d96e 100755 (executable)
--- a/mtest/t-userv
+++ b/mtest/t-userv
@@ -2,8 +2,6 @@
 
 source mtest/common.tcl
 
-exec env \
-    USERV_USER=Uuser USERV_GROUP=Ginside \
-    ./make-secnet-sites -u \
+run-mss-userv Uuser Ginside -u \
     mtest/header.sites $tmp/groupfiles $tmp/out.sites Ginside \
     < mtest/Ginside.sites