From 3bea9d4e23cf1b0d188f8802aefc18d3c3940988 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 2 Nov 2001 20:03:00 +0000 Subject: [PATCH] * v4gssftp.exp: Calling send_error from within a dejagnu test is wrong. So is calling exit. Fix to not do these things. Expect eof rather than "\r" so as to drain pty buffers and avoid deadlock. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13931 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/dejagnu/krb-standalone/ChangeLog | 7 +++++++ src/tests/dejagnu/krb-standalone/v4gssftp.exp | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index 59eaae32c..768c1b72f 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,3 +1,10 @@ +2001-11-02 Tom Yu + + * v4gssftp.exp: Calling send_error from within a dejagnu test is + wrong. So is calling exit. Fix to not do these things. Expect + eof rather than "\r" so as to drain pty buffers and avoid + deadlock. + 2001-11-02 Tom Yu * gssftp.exp: Calling send_error from within a dejagnu test is diff --git a/src/tests/dejagnu/krb-standalone/v4gssftp.exp b/src/tests/dejagnu/krb-standalone/v4gssftp.exp index 859cce470..7026aa6b3 100644 --- a/src/tests/dejagnu/krb-standalone/v4gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/v4gssftp.exp @@ -455,7 +455,8 @@ proc v4ftp_test { } { set testname "quit(v4)" send "quit\r" - expect "\r" + expect_after + expect eof if [check_exit_status $testname] { pass $testname } @@ -494,7 +495,5 @@ if [info exists home] { } if { $status != 0 } { - send_error "ERROR: error in ftp.exp\n" - send_error "$msg\n" - exit 1 + perror "error in gssftp.exp: $msg" } -- 2.26.2