+ dejagnu: set env(TERM) dumb, find ktutil, drain for gss, rlogin tests

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

6 files changed, 59 insertions, 5 deletions

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 2373d7ad09..5416b6a5df 100644
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,21 @@
+Mon Nov 11 20:52:27 1996  Mark Eichin  <eichin@cygnus.com>
+
+	* dejagnu: set env(TERM) dumb, find ktutil
+
+	Tue Sep 17 20:58:43 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* default.exp: Set terminal type to "dumb" to avoid interference
+	from "resize".
+
+	Tue Sep  3 02:27:40 1996  Mark W. Eichin  <eichin@kitten.gen.ma.us>
+
+	* default.exp: find a path to ktutil, for the v4 tests.
+
+	Wed Jun 12 12:56:10 1996  Mark W. Eichin  <eichin@kitten.gen.ma.us>
+
+	* default.exp (setup_kerberos_files): set default_domain, so v4
+	tests work.
+
 Sun Nov 10 09:48:58 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* default.exp (setup_wrapper): Set KRB5_CONFIG in script.
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 80df7e9872..4e3ebeb07d 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -13,6 +13,7 @@
 
 set timeout 100
 set stty_init {erase \^h kill \^u}
+set env(TERM) dumb
 
 # We do everything in a temporary directory.
 if ![file isdirectory tmpdir] {catch "exec mkdir tmpdir" status}
@@ -101,6 +102,10 @@ if ![info exists KINIT] {
     set KINIT [findfile $objdir/../../clients/kinit/kinit]
 }
 
+if ![info exists KTUTIL] {
+    set KTUTIL [findfile $objdir/../../kadmin/ktutil/ktutil]
+}
+
 if ![info exists RESOLVE] {
     set RESOLVE [findfile $objdir/../resolve/resolve]
 }
@@ -309,6 +314,7 @@ proc setup_kerberos_files { } {
     puts $conffile "	$REALMNAME = \{"
     puts $conffile "		kdc = $hostname:3088"
     puts $conffile "		admin_server = $hostname:3750"
+    puts $conffile "		default_domain = $domain"
     puts $conffile "	\}"
     puts $conffile ""
     puts $conffile "\[domain_realm\]"
diff --git a/src/tests/dejagnu/krb-root/ChangeLog b/src/tests/dejagnu/krb-root/ChangeLog
index de6e521f9a..1b48d50fc1 100644
--- a/src/tests/dejagnu/krb-root/ChangeLog
+++ b/src/tests/dejagnu/krb-root/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 11 20:53:38 1996  Mark Eichin  <eichin@cygnus.com>
+	Tue Sep 17 18:30:57 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* rlogin.exp: In first rlogin test, drain last \r from rlogin
+	session to prevent rlogin from hanging in tcsetattr(TCSADRAIN)
+	call.
+
 Mon May  6 11:44:18 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* telnet.exp: Use a wrapper script for login.krb5 to setup shared
diff --git a/src/tests/dejagnu/krb-root/rlogin.exp b/src/tests/dejagnu/krb-root/rlogin.exp
index 87263e8b6f..4e8497049e 100644
--- a/src/tests/dejagnu/krb-root/rlogin.exp
+++ b/src/tests/dejagnu/krb-root/rlogin.exp
@@ -197,6 +197,11 @@ proc rlogin_test { } {
 	    pass $testname
 	}
     }
+    # This last expect seems useless, but without it the rlogin process
+    # sometimes hangs on HP-UX, in a tcsetattr call with TCSADRAIN.
+    expect {
+        "\r" { }
+    }
 
     expect_after
 
diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 2ac0e831e8..38842c0961 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 11 20:54:37 1996  Mark Eichin  <eichin@cygnus.com>
+	Tue Sep 17 19:19:56 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+	* gssapi.exp (doit): Add more info to first set of "gssclient3"
+	failure messages.  Drain client-side output in gssclient3 tests
+	also, to prevent hanging on HP-UX.
+
 Wed Nov  6 20:31:52 1996  Tom Yu  <tlyu@mit.edu>
 
 	* gssftp.exp: Check for "foo: No such file or directory" in
diff --git a/src/tests/dejagnu/krb-standalone/gssapi.exp b/src/tests/dejagnu/krb-standalone/gssapi.exp
index 58a9e12534..5c229fffad 100644
--- a/src/tests/dejagnu/krb-standalone/gssapi.exp
+++ b/src/tests/dejagnu/krb-standalone/gssapi.exp
@@ -350,28 +350,33 @@ proc doit { } {
     expect_after {
 	-i $gss_server_spawn_id
 	timeout {
-	    fail gssclient3
+	    fail "gssclient3 (server timeout)"
 	    catch "expect_after"
 	    return
 	}
 	eof {
-	    fail gssclient3
+	    fail "gssclient3 (server eof)"
 	    catch "expect_after"
 	    return
 	}
     }
     expect -i $gss_server_spawn_id "Accepted connection: \"gsstest3@$REALMNAME\""
+    # Drain some output from the verbose client side.  Otherwise, this
+    # test sometimes fails under HP-UX.
+    expect -i $spawn_id "\"gsstest3@KRBTEST.COM\" to \"gssservice"
+    expect -i $spawn_id "Mechanism { * } supports * name"
+
     expect -i $gss_server_spawn_id "Received message: \"message from gsstest3\""
     catch "expect_after"
     expect_after {
 	-i $spawn_id
 	timeout {
-	    fail gssclient3
+	    fail "gssclient3 (timeout)"
 	    catch "expect_after"
 	    return
 	}
 	eof {
-	    fail gssclient3
+	    fail "gssclient3 (eof)"
 	    catch "expect_after"
 	    return
 	}
@@ -379,7 +384,7 @@ proc doit { } {
     expect -i $spawn_id "Signature verified"
     catch "expect_after"
     if ![check_exit_status gssclient3] {
-	fail gssclient3
+	fail "gssclient3 (exit status)"
 	return
     }
     pass gssclient3
@@ -534,6 +539,12 @@ proc doit { } {
 	}
     }
     expect -i $gss_server_spawn_id "Accepted connection: \"gsstest3@$REALMNAME\""
+
+    # Drain some output from the verbose client side.  Otherwise, this
+    # test sometimes fails under HP-UX.
+    expect -i $spawn_id "\"gsstest3@KRBTEST.COM\" to \"gssservice"
+    expect -i $spawn_id "Mechanism { * } supports * name"
+
     expect -i $gss_server_spawn_id "Received message: \"message from gsstest3\""
     catch "expect_after"
     expect_after {