Testing: Move expect_before timeout to right place

[cgi-auth-flexible.git] / tests / autotest

diff --git a/tests/autotest b/tests/autotest
index 9c4f9c4bb3272e0e763ea8e7a38b43905d553883..60ef3ffce6357007db3af862c2a4affcd27fbdbb 100755 (executable)
--- a/tests/autotest
+++ b/tests/autotest
@@ -2,16 +2,27 @@
 
 set testfile [lindex $argv 0]
 
-set tt tests/tmp
+switch -glob -- $testfile {
+    tests/*.at {
+       regsub {^tests/} $testfile {tests/tmp/} tt
+       regsub {\.at$} $tt {} tt
+    }
+    * {
+       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
 
 log_user 0
 log_file -a $tt/expect.log
@@ -20,9 +31,7 @@ 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"
 }
-set timeout 5
-
-expect_after timeout timeout-abort
+set timeout 10
 
 proc elog {args} {
      set m "[list expect [lindex $args end]]"
@@ -46,6 +55,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}
 }