ignore extra lines output when debugging code enabled

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

diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index e565321f2751309e1ab020e873405732738697b6..1d6c648b762f371c8ce6fc795643cea4f1ba42c0 100644 (file)
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-02  Ken Raeburn  <raeburn@mit.edu>
+
+       * lib/helpers.exp (expect_kadm_ok, eof_client): Accept and ignore
+       debugging messages starting "marshall_new_creds" or "gssapi_", and
+       blank lines.
+
 2003-01-07  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.ov: Deleted.

diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp
index 54e0ef4301f8b0a128ff9fce3274e38a32f16461..c1d691e67fee8436943ee063f54e8e9d843cbc21 100644 (file)
--- a/src/lib/rpc/unit-test/lib/helpers.exp
+++ b/src/lib/rpc/unit-test/lib/helpers.exp
@@ -51,6 +51,9 @@ proc expect_kadm_ok {} {
     expect {
        -i $kadmin_tcl_spawn_id
        -re "^OK OVSEC_KADM_OK \[^\n\]*\n" {}
+       -re "^marshall_new_creds: \[^\n\]*\n" { exp_continue }
+       -re "^gssapi_\[^\n\]*\n" { exp_continue }
+       -re "^\r?\n" { exp_continue }
        default { perror "didn't get ok back" }
     }
 }
@@ -190,6 +193,9 @@ proc eof_client {testname ccname id status} {
 
        expect {
                -i $id
+               -re "^marshall_new_creds\[^\n\]*\n" { exp_continue }
+               -re "^gssapi_\[^\n\]*\n" { exp_continue }
+               -re "^\r?\n" { exp_continue }
                eof { verbose $expect_out(buffer) 1 }
                timeout { 
                        fail "$testname: timeout waiting for client $ccname to exit"