diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/dejagnu/config/ChangeLog | 9 | ||||
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 15 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index b37eace920..ee881c6b35 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,12 @@ +2003-01-23 Ken Raeburn <raeburn@mit.edu> + + * default.exp (start_kerberos_daemons): Record more information + when "tail -f" doesn't show the mark written to the log file. + Look for and discard non-matching lines. + (setup_root_shell): Ignore the message displayed by rlogin when + a connection is refused to one address but other addresses are + available. + 2002-11-08 Tom Yu <tlyu@mit.edu> * default.exp: Add (disabled) debugging code for catching leaking diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 6ee06097d2..aecf23e8bd 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -1304,6 +1304,7 @@ proc start_kerberos_daemons { standalone } { global kadmind_spawn_id global tmppwd global env + global timeout if ![setup_kerberos_db 0] { return 0 @@ -1342,12 +1343,13 @@ proc start_kerberos_daemons { standalone } { expect { -i $tailf_spawn_id -ex "$markstr\r\n" { } + -re "\[^\r\n\]*\r\n" { exp_continue } timeout { if {$standalone} { - verbose -log "tail -f timed out looking for mark" + verbose -log "tail -f timed out ($timeout sec) looking for mark in kdc log" fail "krb5kdc" } else { - perror "krbkdc tail -f timed out looking for mark" + perror "krbkdc tail -f timed out ($timeout sec) looking for mark in kdc log" } stop_kerberos_daemons exec kill $tailf_pid @@ -1418,12 +1420,13 @@ proc start_kerberos_daemons { standalone } { expect { -i $tailf_spawn_id -ex "$markstr\r\n" { } + -re "\[^\r\n\]*\r\n" { exp_continue } timeout { if {$standalone} { - verbose -log "tail -f timed out looking for mark" + verbose -log "tail -f timed out ($timeout sec) looking for mark in kadmind log" fail "kadmind" } else { - perror "kadmind tail -f timed out looking for mark" + perror "kadmind tail -f timed out ($timeout sec) looking for mark in kadmind log" } stop_kerberos_daemons exec kill $tailf_pid @@ -2233,6 +2236,10 @@ proc setup_root_shell { testname } { set timeout 300 expect { + -re {connect to address [0-9a-fA-F.:]*: Connection refused} { + note $expect_out(buffer) + exp_continue + } -re "word:|erberos rlogin failed|ection refused|ection reset by peer" { note "$testname test requires ability to rlogin as root" unsupported "$testname" |