* default.exp (setup_root_shell): Handle error messages indicating "-x" isn't

supported.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15545 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 06881a7196713de3608e8ea872a443f6abca78c3..ec5c16cd852018124bd6f68a5d93fd727041b31f 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-03  Ken Raeburn  <raeburn@mit.edu>
+
+       * default.exp (setup_root_shell): Handle error messages indicating
+       "-x" isn't supported.
+
 2003-06-01  Ken Raeburn  <raeburn@mit.edu>
 
        * default.exp: Default RLOGIN_FLAGS to "-x".

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 3e6b27f2874d7e136082158cb879a944d58b770a..38d8cc89215a92f558c94cf77f526a3b0625130f 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -2237,6 +2237,15 @@ proc setup_root_shell { testname } {
            stop_root_shell
            return 0
        }
+       "usage: rlogin" -
+       "illegal option -- x" -
+       "invalid option -- x" {
+           note "$testname: rlogin doesn't like command-line flags"
+           unsupported "$testname"
+           set timeout $old_timeout
+           stop_root_shell
+           return 0
+       }
        -re "$ROOT_PROMPT" { }
        timeout {
            perror "timeout from rlogin $hostname -l root"
@@ -2247,7 +2256,7 @@ proc setup_root_shell { testname } {
            return 0
        }
        eof {
-           if $got_refused {
+           if {$got_refused} {
                # reported some errors, continued, and failed
                note "$testname test requires ability to log in as root"
                unsupported $testname