test-common: Framework for compatibility tests

[secnet.git] / stest / common.tcl

diff --git a/stest/common.tcl b/stest/common.tcl
index 65c39b465837b63b6b025c19258441b0dcd5687f..89045a5147b5fb46206385be1c0afb8ab25bff91 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -25,8 +25,10 @@ set extra(inside) {
 }
 set extra(outside) {}
 
-set privkey(inside) test-example/inside.key
-set privkey(outside) test-example/outside.key
+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
@@ -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]
@@ -156,7 +159,7 @@ proc spawn-secnet {location site} {
     foreach k [array names env] {
        switch -glob $k {
            SECNET_STEST_DIVERT_* -
-           SECNET_TEST_BUILDDIR { }
+           SECNET_TEST_BUILDDIR - OLD_SECNET_DIR { }
            *SECNET* -
            *PRELOAD* { puts -nonewline " $k=$env($k)" }
        }