diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/tests/dejagnu/config/ChangeLog | 5 | ||||
-rw-r--r-- | src/tests/dejagnu/config/default.exp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index 773ae8c85f..c7f21da60d 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,8 @@ +2003-06-04 Tom Yu <tlyu@mit.edu> + + * default.exp (setup_root_shell): Don't try to use the procedure + "-" when handling error messages from rlogin. + 2003-06-03 Ken Raeburn <raeburn@mit.edu> * default.exp (setup_root_shell): Handle error messages indicating diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index 5f9aa2734a..dee8509ee6 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -2237,9 +2237,7 @@ proc setup_root_shell { testname } { stop_root_shell return 0 } - "usage: rlogin" - - "illegal option -- x" - - "invalid option -- x" { + -re "usage: rlogin|illegal option -- x|invalid option -- x" { note "$testname: rlogin doesn't like command-line flags" unsupported "$testname" set timeout $old_timeout |