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 b436a47f7157dbe9b0c941a23a796b0bda1e29b3..c33db2caedd641dca0bb137f9b4db55d3e091a58 100644 (file)
--- 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 34a4ad02693bbda39ed5cba2a0ff8fcd7497a469..d6b1b57ab424184c24d3a856a8571bd62b95d33a 100755 (executable)
--- 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
+