From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Dec 2019 11:35:02 +0000 (+0000)
Subject: tests: Pass --output-version=1 to make-secnet-sites
X-Git-Tag: v0.6.0~78
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=5e7a4f71cfa3771e126338f78382593a5c502828;p=secnet.git

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 ad754c1..8f22500 100755
--- 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 98a9266..ee9938d 100755
--- 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/Dir.sd.mk b/test-example/Dir.sd.mk
index 763e169..4e0a134 100644
--- a/test-example/Dir.sd.mk
+++ b/test-example/Dir.sd.mk
@@ -7,7 +7,7 @@ include common.make
 
 &sites.conf: $(src)/make-secnet-sites &^/sites &/Dir.mk
 	mkdir -p &pubkeys
-	$(src)/make-secnet-sites &^/sites $@
+	$(src)/make-secnet-sites --output-version=1 &^/sites $@
 
 &clean::
 	rm -rf &pubkeys