From: Tom Yu <tlyu@mit.edu>
Date: Sat, 9 Nov 2002 03:35:29 +0000 (+0000)
Subject: Oops, missed a few checks for eof
X-Git-Tag: krb5-1.3-alpha1~281
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10832cbb6d7c2f5ee4baa9fe6582ebb32bdd8d23;p=krb5.git

Oops, missed a few checks for eof

ticket: 1249
status: open

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 83a2d90d2..b37eace92 100644
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -3,6 +3,8 @@
 	* default.exp: Add (disabled) debugging code for catching leaking
 	ptys.  expect eof from the correct spawn_ids when killing kdc and
 	kadmind to avoid leaking ptys.
+	(do_klist, v4klist, v4klist_none): Check for eof to avoid leaking
+	ptys.
 
 2002-10-07  Tom Yu  <tlyu@mit.edu>
 
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 4eb76ca4a..6ee06097d 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -1871,10 +1871,7 @@ proc do_klist { myname servname testname } {
 	}
     }
 
-    expect {
-        "\r" { }
-	eof { }
-    }
+    expect eof
 
     if ![check_exit_status $testname] {
 	return 0
@@ -1939,6 +1936,7 @@ proc do_klist_err { testname } {
     }
     # We can't use check_exit_status, because we expect an exit status
     # of 1.
+    catch "expect eof"
     set status_list [wait -i $spawn_id]
     verbose "wait -i $spawn_id returned $status_list ($testname)"
     if { [lindex $status_list 2] != 0 } {
@@ -2113,10 +2111,7 @@ proc v4klist { client server testname } {
 	}
     }
 
-    expect {
-        "\r" { }
-	eof { }
-    }
+    expect eof
 
     if ![check_exit_status $testname] {
 	return 0
@@ -2160,6 +2155,7 @@ proc v4klist_none { testname } {
     }
     # We can't use check_exit_status, because we expect an exit status
     # of 1.
+    expect eof
     set status_list [wait -i $spawn_id]
     verbose "wait -i $spawn_id returned $status_list (v4klist)"
     if { [lindex $status_list 2] != 0 } {