tests: Introduce `diff' proc

No functional change.

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

diff --git a/mtest/common.tcl b/mtest/common.tcl
index e3b67c40a55242d6430266e6bd704d983fff44e9..a016dae85fd35b3fb13d3f8c994865873210000e 100644 (file)
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -17,13 +17,17 @@ proc run-mss-userv {user group args} {
 
 proc run-mss {args} { eval [list exec] [mss-program] $args }
 
+proc diff {a b seddery} {
+    exec bash -c "
+       diff -u <($seddery $a) \\
+               <($seddery $b)
+    "
+}
+
 proc diff-output {expected got suffix} {
     global seddery
     global tmp
-    exec bash -c "
-       diff -u <($seddery mtest/$expected$suffix) \\
-               <($seddery $tmp/$got$suffix      )
-    "
+    diff mtest/$expected$suffix $tmp/$got$suffix $seddery
 }
 
 file mkdir $tmp/groupfiles

diff --git a/mtest/t-basic b/mtest/t-basic
index e3ced5a9b76a507621f7a75173afd089d758d8d7..ad754c166c588bbb11333cc4d89a12935bff68b9 100755 (executable)
--- a/mtest/t-basic
+++ b/mtest/t-basic
@@ -5,7 +5,4 @@ source mtest/common.tcl
 run-mss --no-conf-key-prefix test-example/sites $tmp/out.conf
 
 set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
-exec bash -c "
-    diff -u <($seddery mtest/e-basic.conf) \\
-            <($seddery $tmp/out.conf     )
-"
+diff  mtest/e-basic.conf $tmp/out.conf $seddery