chiark
/
gitweb
/
~ian
/
cgi-auth-flexible.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testing: autotest: Print id in log messages
[cgi-auth-flexible.git]
/
tests
/
autotest
diff --git
a/tests/autotest
b/tests/autotest
index 60ef3ffce6357007db3af862c2a4affcd27fbdbb..1cea707f8df1a4263a988a6196659c0acd8f6cee 100755
(executable)
--- a/
tests/autotest
+++ b/
tests/autotest
@@
-4,10
+4,12
@@
set testfile [lindex $argv 0]
switch -glob -- $testfile {
tests/*.at {
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]
}
}
set tt tests/tmp/[info pid]
}
}
@@
-29,13
+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"
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 10
proc elog {args} {
}
set timeout 10
proc elog {args} {
+ global id
set m "[list expect [lindex $args end]]"
set m "[list expect [lindex $args end]]"
- puts stderr
$m
+ puts stderr
"$id: $m"
# send_log "\n$m\n"
eval expect $args
}
# send_log "\n$m\n"
eval expect $args
}
@@
-79,4
+82,4
@@
proc loginas {user {password sesame} {wanttxt ACCESSGRANTED}} {
source $testfile
source $testfile
-puts
ok
+puts
"$id: ok"