stest: Don't prefix ./ with another ./, in socktmp

[secnet.git] / stest / common.tcl

diff --git a/stest/common.tcl b/stest/common.tcl
index 0c1202ca378b3b34ed58820447a0a206a13ec628..e368f117647b3de901adf24d3f708e9e97c8bbab 100644 (file)
--- a/stest/common.tcl
+++ b/stest/common.tcl
@@ -80,11 +80,13 @@ exec cat
        local-key rsa-private(\"$builddir/test-example/$site.key\");
 "
     append cfg $extra($site)
-    append cfg {
+    append cfg "
        log logfile {
-           filename "/dev/tty";
-           class "info","notice","warning","error","security","fatal";
+           prefix \"$site\";
+           class \"debug\",\"info\",\"notice\",\"warning\",\"error\",\"security\",\"fatal\";
        };
+    "
+    append cfg {
        system {
        };
        resolver adns {
@@ -108,12 +110,22 @@ proc spawn-secnet {location site} {
     global tmp
     global builddir
     global netlinkfh
+    global env
     upvar #0 pids($site) pid
     set cf $tmp/$site.conf
     set ch [open $cf w]
     puts $ch [mkconf $location $site]
     close $ch
     set argl [list $builddir/secnet -dvnc $cf]
+    puts -nonewline "spawn"
+    foreach k [array names env] {
+       switch -glob $k {
+           SECNET_TEST_BUILDDIR { }
+           *SECNET* -
+           *PRELOAD* { puts -nonewline " $k=$env($k)" }
+       }
+    }
+    puts " $argl"
     set pid [fork]
     if {!$pid} {
        execl [lindex $argl 0] [lrange $argl 1 end]
@@ -168,7 +180,7 @@ proc sendpkt {} {
 
 set socktmp $tmp/s
 exec mkdir -p -m700 $socktmp
-regsub {^(?!/)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /
+regsub {^(?!/|\./)} $socktmp {./} socktmp ;# dgram-socket wants ./ or /
 
 proc prefix_preload {lib} { prefix_some_path LD_PRELOAD $lib }