From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 3 Dec 2019 23:26:20 +0000 (+0000)
Subject: stest: Honour new sitesconf_hook
X-Git-Tag: v0.6.0~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=680c1fdcb04ec1670d47b910f981d86863838b1b

stest: Honour new sitesconf_hook

This lets individual tests fiddle with the sites.conf.

By default, we provide a proc that does nothing.

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

diff --git a/stest/common.tcl b/stest/common.tcl
index fb98c2e..cbf8fc1 100644
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -28,6 +28,8 @@ set extra(outside) {}
 set privkey(inside) test-example/inside.privkeys/
 set privkey(outside) test-example/outside.privkeys/
 
+proc sitesconf_hook {l} { return $l }
+
 proc mkconf {location site} {
     global tmp
     global builddir
@@ -125,6 +127,7 @@ exec cat
     set f [open $sitesconf r]
     while {[gets $f l] >= 0} {
 	regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
+	set l [sitesconf_hook $l]
 	append cfg $l "\n"
     }
     set sites [read $f]