mtest: Break out diff-output

No functional change

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

diff --git a/mtest/common.tcl b/mtest/common.tcl
index 4fc27e7fff590dfd06a74ba85b470e30aef3ed18..e3b67c40a55242d6430266e6bd704d983fff44e9 100644 (file)
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -17,9 +17,20 @@ proc run-mss-userv {user group args} {
 
 proc run-mss {args} { eval [list exec] [mss-program] $args }
 
+proc diff-output {expected got suffix} {
+    global seddery
+    global tmp
+    exec bash -c "
+       diff -u <($seddery mtest/$expected$suffix) \\
+               <($seddery $tmp/$got$suffix      )
+    "
+}
+
 file mkdir $tmp/groupfiles
 
 set env(PYTHONHASHSEED) 0
 set env(PYTHONBYTECODEBASE) 0
 
+set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
+
 prefix_some_path PYTHONPATH .

diff --git a/mtest/t-userv b/mtest/t-userv
index e20121dd8d925696ff8b03579353f74367f4cb1e..1581d3a20c6ebf476e91d776a9d62fcaeb55f5c3 100755 (executable)
--- a/mtest/t-userv
+++ b/mtest/t-userv
@@ -6,8 +6,4 @@ run-mss-userv Uuser Ginside -u \
     mtest/header.sites $tmp/groupfiles $tmp/out.sites Ginside \
     < mtest/Ginside.sites
 
-set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
-exec bash -c "
-    diff -u <($seddery mtest/e-userv.sites) \\
-            <($seddery $tmp/out.sites     )
-"
+diff-output e-userv out .sites