X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=stest%2Fcommon.tcl;h=bcca102c49b9db77a143a0930bbb7e0796c37def;hb=90c43c174012d0352b4d05859c82c5993cb10f73;hp=9a7e38f4525391b8603f32d37e5d2c40dc17418f;hpb=4873f6799e4d072e95baaa4b33283d0413b090ee;p=secnet.git

diff --git a/stest/common.tcl b/stest/common.tcl
index 9a7e38f..bcca102 100644
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -85,6 +85,7 @@ exec cat
 "
     switch -glob $privkey {
 	*/ {
+	    set sitesconf sites.conf
 	    append cfg "
 	        key-cache priv-cache({
 		    privkeys \"$builddir/${privkey}priv.\";
@@ -92,11 +93,13 @@ exec cat
 "
 	}
 	* {
+	    set sitesconf sites.conf
 	    append cfg "
 		local-key rsa-private(\"$builddir/$privkey\");
 "
 	}
     }
+    set sitesconf $builddir/test-example/$sitesconf
     
     append cfg $extra($site)
     append cfg "
@@ -119,7 +122,7 @@ exec cat
     file delete -force $pubkeys
     exec cp -rl $builddir/test-example/pubkeys $pubkeys
 
-    set f [open $builddir/test-example/sites.conf r]
+    set f [open $sitesconf r]
     while {[gets $f l] >= 0} {
 	regsub {\"[^\"]*test-example/pubkeys/} $l "\"$pubkeys/" l
 	append cfg $l "\n"