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=f2b2870665fcc91a70234744b76df552331ba6d2;hb=829bdfa8f56bef52b9eb22d9e4753463cd945dd0;hpb=3eb1b34dd6160ab9e454feb2648ca3ef52d33eaa

diff --git a/tests/autotest b/tests/autotest
index f2b2870..1cea707 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -4,10 +4,12 @@ set testfile [lindex $argv 0]
 
 switch -glob -- $testfile {
     tests/*.at {
-	regsub {^tests/} $testfile {tests/tmp/} tt
-	regsub {\.at$} $tt {} tt
+	regsub {^tests/} $testfile {} id
+	regsub {\.at$} $id {} id
+	set tt "tests/tmp/$id"
     }
     * {
+	set id "\[[info pid]\]"
 	set tt tests/tmp/[info pid]
     }
 }
@@ -29,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
 }
@@ -57,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}
 }
 
@@ -79,4 +82,4 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
 
 source $testfile
 
-puts ok
+puts "$id: ok"