From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 10 Mar 2020 17:54:39 +0000 (+0000)
Subject: mtest: Break out diff-mss-sites-conf
X-Git-Tag: v0.6.1~20
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b97b3638508f6971df7e65f54150681d411ebee0;p=secnet.git

mtest: Break out diff-mss-sites-conf

No functional change.

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

diff --git a/mtest/common.tcl b/mtest/common.tcl
index b436a47..c33db2c 100644
--- a/mtest/common.tcl
+++ b/mtest/common.tcl
@@ -32,6 +32,11 @@ proc diff-output {expected got suffix} {
     diff mtest/$expected$suffix $tmp/$got$suffix $seddery
 }
 
+proc diff-mss-sites-conf {expected got} {
+    set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
+    diff $expected $got $seddery
+}
+
 file mkdir $tmp/groupfiles
 
 set env(PYTHONHASHSEED) 0
diff --git a/mtest/t-basic b/mtest/t-basic
index 34a4ad0..d6b1b57 100755
--- a/mtest/t-basic
+++ b/mtest/t-basic
@@ -4,5 +4,5 @@ source mtest/common.tcl
 
 run-mss --no-conf-key-prefix --pubkeys-elide test-example/sites $tmp/out.conf
 
-set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
-diff  mtest/e-basic.conf $tmp/out.conf $seddery
+diff-mss-sites-conf mtest/e-basic.conf $tmp/out.conf
+