test: Slurp test-example/sites.conf and paste it in

This will enable us to edit this common config.

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

diff --git a/test/common.tcl b/test/common.tcl
index 3a2e1ae39194f64d7f46e20f60fd23ab019cdbcd..cac5bfda4c885a69582a893c17fc0ee3085327f1 100644 (file)
--- a/test/common.tcl
+++ b/test/common.tcl
@@ -88,7 +88,13 @@ exec cat
        log-events "all";
        random randomfile("/dev/urandom",no);
        transform eax-serpent { }, serpent256-cbc { };
        log-events "all";
        random randomfile("/dev/urandom",no);
        transform eax-serpent { }, serpent256-cbc { };

-       include test-example/sites.conf
+    }
+
+    set f [open test-example/sites.conf r]
+    set sites [read $f]
+    close $f
+    append cfg $sites
+    append cfg {

        sites map(site,vpn/test-example/all-sites);
     }
     return $cfg
        sites map(site,vpn/test-example/all-sites);
     }
     return $cfg