diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/dejagnu/config/ChangeLog | 6 | ||||
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index 7d8589b47..8fd69dd2f 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,9 @@ +2003-03-14 Ken Raeburn <raeburn@mit.edu> + + * default.exp (setup_root_shell): If we get connection refused + messages, followed by no unrecognized errors and then eof, report + it as an unsupported test. + 2003-02-04 Tom Yu <tlyu@mit.edu> * default.exp (start_kerberos_daemons): Use correct argument to diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index f025eb763..ececbf7d7 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -2234,10 +2234,12 @@ proc setup_root_shell { testname } { set rlogin_pid [exp_pid] set old_timeout $timeout set timeout 300 + set got_refused 0 expect { -re {connect to address [0-9a-fA-F.:]*: Connection refused} { note $expect_out(buffer) + set got_refused 1 exp_continue } -re "word:|erberos rlogin failed|ection refused|ection reset by peer" { @@ -2257,7 +2259,14 @@ proc setup_root_shell { testname } { return 0 } eof { - perror "eof from rlogin $hostname -l root" + if $got_refused { + # reported some errors, continued, and failed + note "$testname test requires ability to log in as root" + unsupported $testname + } else { + # unknown problem? + perror "eof from rlogin $hostname -l root" + } stop_root_shell set timeout $old_timeout catch "expect_after" |