tests: Pass --output-version=1 to make-secnet-sites

We are going to introduce some new public keys in the sites file but
for now we don't want to change the sites.conf output.  This is what
--output-version is for.

Later we will relegate this to compatibility tests, and make the new
approach the default.

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

diff --git a/mtest/t-basic b/mtest/t-basic
index ad754c166c588bbb11333cc4d89a12935bff68b9..8f22500fb9c6c2476b44e2cdbf2cff300765d6ec 100755 (executable)
--- a/mtest/t-basic
+++ b/mtest/t-basic
@@ -2,7 +2,7 @@
 
 source mtest/common.tcl
 
-run-mss --no-conf-key-prefix test-example/sites $tmp/out.conf
+run-mss --no-conf-key-prefix --output-version=1 test-example/sites $tmp/out.conf
 
 set seddery { sed -n 's/^[ \t]*//; /^[^#]/p' }
 diff  mtest/e-basic.conf $tmp/out.conf $seddery

diff --git a/mtest/t-prefix b/mtest/t-prefix
index 98a92669d517334b65b1f23f29168221a6efc7d8..ee9938db0da20a5783aeb4e5487f289b056cdc70 100755 (executable)
--- a/mtest/t-prefix
+++ b/mtest/t-prefix
@@ -2,7 +2,7 @@
 
 source mtest/common.tcl
 
-run-mss -Ppprefix --no-conf-key-prefix test-example/sites $tmp/out.conf
+run-mss -Ppprefix --no-conf-key-prefix --output-version=1 test-example/sites $tmp/out.conf
 
 diff  mtest/e-basic.conf $tmp/out.conf \
     "sed -e 's/vpn/pprefixvpn/g; s/^all-sites/pprefix&/' | $seddery" \

diff --git a/test-example/Subdir.sd.mk b/test-example/Subdir.sd.mk
index 4c4887c6414e0b1dfb057630bf69b017053a39e6..e7e6f9c74ce5a61aca972903cec4b4ff0ef125b2 100644 (file)
--- a/test-example/Subdir.sd.mk
+++ b/test-example/Subdir.sd.mk
@@ -7,7 +7,7 @@ include common.make
 
 &sites.conf: $(src)/make-secnet-sites &^/sites &/Subdir.mk
        mkdir -p &pubkeys
-       $(src)/make-secnet-sites &^/sites $@
+       $(src)/make-secnet-sites --output-version=1 &^/sites $@
 
 &clean::
        rm -rf &pubkeys