* 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

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 59eaae32cbe82ba5cc439c9df29ca6db20c85412..768c1b72f49ab8e57a89a46861ed00ade51e4090 100644 (file)
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-02  Tom Yu  <tlyu@mit.edu>
+
+       * 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  <tlyu@mit.edu>
 
        * 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 859cce47067905a451236c14cd0b3451e1bddfdd..7026aa6b371522553ae002648eb436318957cb64 100644 (file)
--- 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"
 }