X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=cgi-auth-flexible.git;a=blobdiff_plain;f=tests%2Fautotest;h=b07913fa68bc0cc08e5f0c5a01ef8207cce930d5;hp=60ef3ffce6357007db3af862c2a4affcd27fbdbb;hb=8ab1e1db8a676282fd82a8c1c9cdae62111fd784;hpb=a2d1d2c00b41c075fd61c899c8884c2012817343

diff --git a/tests/autotest b/tests/autotest
index 60ef3ff..b07913f 100755
--- a/tests/autotest
+++ b/tests/autotest
@@ -1,13 +1,32 @@
 #!/usr/bin/expect -f
 
+# This is part of CGI::Auth::Flexible, a perl CGI authentication module.
+#
+# Copyright 2012,2013,2015 Ian Jackson.
+# Copyright 2012,2013,2015 Citrix.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version, with the "CAF Login Exception"
+# as published by Ian Jackson (version 1, or at your option any 
+# later version) as an Additional Permission.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
 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]
     }
 }
@@ -28,14 +47,16 @@ log_user 0
 log_file -a $tt/expect.log
 
 proc timeout-abort {} {
+    global id
      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 10
+set timeout 15
 
 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
 }
@@ -79,4 +100,4 @@ proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
 
 source $testfile
 
-puts ok
+puts "$id: ok"