From 17ae192c4b76885ea8d4faace8634f9f36d84d8f Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 3 Jun 2003 12:50:59 +0000 Subject: [PATCH] * 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 --- src/tests/dejagnu/config/ChangeLog | 5 +++++ src/tests/dejagnu/config/default.exp | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index 06881a719..ec5c16cd8 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,8 @@ +2003-06-03 Ken Raeburn + + * default.exp (setup_root_shell): Handle error messages indicating + "-x" isn't supported. + 2003-06-01 Ken Raeburn * default.exp: Default RLOGIN_FLAGS to "-x". diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 3e6b27f28..38d8cc892 100644 --- 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 -- 2.26.2