X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=tests%2Fautotest;h=1cea707f8df1a4263a988a6196659c0acd8f6cee;hp=2fc09861f54d641339e013b57e9c0169391810d9;hb=829bdfa8f56bef52b9eb22d9e4753463cd945dd0;hpb=61f3391ccbc80f515eb7210cc87e314b7058b05f

diff --git a/tests/autotest b/tests/autotest
index 2fc0986..1cea707 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -2,15 +2,26 @@
 
 set testfile [lindex $argv 0]
 
-set tt tests/tmp
+switch -glob -- $testfile {
+    tests/*.at {
+	regsub {^tests/} $testfile {} id
+	regsub {\.at$} $id {} id
+	set tt "tests/tmp/$id"
+    }
+    * {
+	set id "\[[info pid]\]"
+	set tt tests/tmp/[info pid]
+    }
+}
 
 exec rm -rf $tt
-exec mkdir $tt
+file mkdir tests/tmp $tt
 
 set pwd [pwd]
 
 set env(HOME) $tt
 set env(CAFTEST_CAF) $pwd
+set env(CAFTEST_TMP) $pwd/$tt
 set env(TERM) vt100
 set env(CAFTEST_NOSRCDUMP) 1
 set env(LC_ALL) en_GB.utf-8
@@ -20,15 +31,14 @@ log_file -a $tt/expect.log
 
 proc timeout-abort {} {
      send_log "\r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-     error "aborting due to timeout"
+     error "$id: aborting due to timeout"
 }
-set timeout 15
-
-expect_after timeout timeout-abort
+set timeout 10
 
 proc elog {args} {
+    global id
      set m "[list expect [lindex $args end]]"
-     puts stderr $m
+     puts stderr "$id: $m"
 #     send_log "\n$m\n"
      eval expect $args
 }
@@ -48,6 +58,8 @@ proc dospawn {} {
      spawn -nottycopy \
      w3m -config /dev/null -o cgi_bin=$pwd/tests file:///cgi-bin/wrap/Tsuffix
 
+     expect_after timeout timeout-abort
+
      epage {You need to log in}
 }
 
@@ -70,4 +82,4 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
 
 source $testfile
 
-puts ok
+puts "$id: ok"