test: Use dedicated tmp directory in variable

We are going to want to run multiple tests at once, so we'll need
this.

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

diff --git a/.gitignore b/.gitignore
index d597aa5e42cc3e74e1874654e9db63938e857694..10fbc239c5cd01d59b4ca8cd623dc67917177eb9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -36,5 +36,4 @@ test-example/sites.conf
 test-example/bogus-setup-request
 build-stamp
 
-test/*.conf
-test/*.fake-userv
+test/tmp

diff --git a/test/invoke b/test/invoke
index 628db20be10ecab53b6b210993403ab6fa7646d6..09b18a3154dd993458fb4de7832bead76c5b224f 100755 (executable)
--- a/test/invoke
+++ b/test/invoke
@@ -25,11 +25,12 @@ set extra(inside) {
 set extra(outside) {}
 
 proc mkconf {which} {
+    global tmp
     global netlink
     global ports
     global extra
     global netlinkfh
-    set pipefp test/$which.netlink
+    set pipefp $tmp/$which.netlink
     foreach tr {t r} {
        file delete $pipefp.$tr
        exec mkfifo -m600 $pipefp.$tr
@@ -37,7 +38,7 @@ proc mkconf {which} {
        fconfigure $fh -blocking 0 -buffering none -translation binary
     }
     fileevent $netlinkfh($which.r) readable [list netlink-readable $which]
-    set fakeuf test/$which.fake-userv
+    set fakeuf $tmp/$which.fake-userv
     set fakeuh [open $fakeuf w 0755]
     puts $fakeuh "#!/bin/sh
 set -e
@@ -95,8 +96,9 @@ exec cat
 
 proc spawn-secnet {which} {
     global netlinkfh
+    global tmp
     upvar #0 pids($which) pid
-    set cf test/$which.conf
+    set cf $tmp/$which.conf
     set ch [open $cf w]
     puts $ch [mkconf $which]
     close $ch
@@ -153,6 +155,9 @@ proc sendpkt {} {
        [hbytes h2raw c0[join $p ""]c0]
 }
 
+file mkdir test/tmp
+set tmp test/tmp
+
 spawn-secnet inside
 spawn-secnet outside