From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 20 Oct 2019 11:08:48 +0000 (+0100)
Subject: mtest: Break out mss-run-userv
X-Git-Tag: v0.5.0~64
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=e8a5679784c19508f1f93f3e51f315cf3977b187

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 6b6b16d..3db8d5c 100644
--- 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 1e5ea25..c1552bc 100755
--- 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