From ad7a23f56e4e095bc41c7803dff47920a31f9537 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 12 Jan 2005 03:47:58 +0000 Subject: [PATCH] * krb-root/rlogin.exp (start_rlogin_daemon): Use built-in sleep command. * krb-root/telnet.exp (start_telnet_daemon): Likewise. * krb-standalone/gssftp.exp (start_ftp_daemon): Use built-in sleep command. * krb-standalone/rcp.exp (start_rsh_daemon): Likewise. * krb-standalone/rsh.exp (start_rsh_daemon): Likewise. * krb-standalone/sample.exp (start_sserver_daemon): Likewise. * krb-standalone/v4gssftp.exp (start_ftp_daemon): Likewise. * krb-standalone/v4krb524d.exp (start_k524_daemon): Likewise. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17016 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/dejagnu/krb-root/ChangeLog | 5 +++++ src/tests/dejagnu/krb-root/rlogin.exp | 2 +- src/tests/dejagnu/krb-root/telnet.exp | 2 +- src/tests/dejagnu/krb-standalone/ChangeLog | 9 +++++++++ src/tests/dejagnu/krb-standalone/gssftp.exp | 2 +- src/tests/dejagnu/krb-standalone/rcp.exp | 2 +- src/tests/dejagnu/krb-standalone/rsh.exp | 2 +- src/tests/dejagnu/krb-standalone/sample.exp | 2 +- src/tests/dejagnu/krb-standalone/v4gssftp.exp | 2 +- src/tests/dejagnu/krb-standalone/v4krb524d.exp | 2 +- 10 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/tests/dejagnu/krb-root/ChangeLog b/src/tests/dejagnu/krb-root/ChangeLog index 328a26cfd..317764bcb 100644 --- a/src/tests/dejagnu/krb-root/ChangeLog +++ b/src/tests/dejagnu/krb-root/ChangeLog @@ -1,3 +1,8 @@ +2005-01-11 Ken Raeburn + + * rlogin.exp (start_rlogin_daemon): Use built-in sleep command. + * telnet.exp (start_telnet_daemon): Likewise. + 2004-11-15 Tom Yu * telnet.exp (telnet_test): Work around possible race condition diff --git a/src/tests/dejagnu/krb-root/rlogin.exp b/src/tests/dejagnu/krb-root/rlogin.exp index 4d8d3bf78..bc4056467 100644 --- a/src/tests/dejagnu/krb-root/rlogin.exp +++ b/src/tests/dejagnu/krb-root/rlogin.exp @@ -101,7 +101,7 @@ proc start_rlogin_daemon { option } { } # Give the rlogin daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the rlogin daemon. diff --git a/src/tests/dejagnu/krb-root/telnet.exp b/src/tests/dejagnu/krb-root/telnet.exp index 03bdb7910..c283d6150 100644 --- a/src/tests/dejagnu/krb-root/telnet.exp +++ b/src/tests/dejagnu/krb-root/telnet.exp @@ -113,7 +113,7 @@ proc start_telnet_daemon { args } { } # Give the telnet daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the telnet daemon. diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog index fe26d2abf..0372fe098 100644 --- a/src/tests/dejagnu/krb-standalone/ChangeLog +++ b/src/tests/dejagnu/krb-standalone/ChangeLog @@ -1,3 +1,12 @@ +2005-01-11 Ken Raeburn + + * gssftp.exp (start_ftp_daemon): Use built-in sleep command. + * rcp.exp (start_rsh_daemon): Likewise. + * rsh.exp (start_rsh_daemon): Likewise. + * sample.exp (start_sserver_daemon): Likewise. + * v4gssftp.exp (start_ftp_daemon): Likewise. + * v4krb524d.exp (start_k524_daemon): Likewise. + 2004-12-20 Tom Yu * pwhist.exp: New file. Perform some sanity checking on password diff --git a/src/tests/dejagnu/krb-standalone/gssftp.exp b/src/tests/dejagnu/krb-standalone/gssftp.exp index 2b04d609a..8d78c58c8 100644 --- a/src/tests/dejagnu/krb-standalone/gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/gssftp.exp @@ -51,7 +51,7 @@ proc start_ftp_daemon { } { set ftpd_pid [exp_pid] # Give the ftp daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the ftp daemon. diff --git a/src/tests/dejagnu/krb-standalone/rcp.exp b/src/tests/dejagnu/krb-standalone/rcp.exp index ffd60a660..94ec240e6 100644 --- a/src/tests/dejagnu/krb-standalone/rcp.exp +++ b/src/tests/dejagnu/krb-standalone/rcp.exp @@ -63,7 +63,7 @@ proc start_rsh_daemon { } { set krshd_pid [exp_pid] # Give the rsh daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the rsh daemon. diff --git a/src/tests/dejagnu/krb-standalone/rsh.exp b/src/tests/dejagnu/krb-standalone/rsh.exp index a39aa15cd..b7c02a2a7 100644 --- a/src/tests/dejagnu/krb-standalone/rsh.exp +++ b/src/tests/dejagnu/krb-standalone/rsh.exp @@ -48,7 +48,7 @@ proc start_rsh_daemon { option } { set krshd_pid [exp_pid] # Give the rsh daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the rsh daemon. diff --git a/src/tests/dejagnu/krb-standalone/sample.exp b/src/tests/dejagnu/krb-standalone/sample.exp index 97503aec6..c19c49e91 100644 --- a/src/tests/dejagnu/krb-standalone/sample.exp +++ b/src/tests/dejagnu/krb-standalone/sample.exp @@ -57,7 +57,7 @@ proc start_sserver_daemon { inetd } { } # Give sserver some time to start - catch "exec sleep 2" + sleep 2 return 1 } diff --git a/src/tests/dejagnu/krb-standalone/v4gssftp.exp b/src/tests/dejagnu/krb-standalone/v4gssftp.exp index ace753fcc..461a8d01d 100644 --- a/src/tests/dejagnu/krb-standalone/v4gssftp.exp +++ b/src/tests/dejagnu/krb-standalone/v4gssftp.exp @@ -60,7 +60,7 @@ proc start_ftp_daemon { } { set ftpd_pid [exp_pid] # Give the ftp daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the ftp daemon. diff --git a/src/tests/dejagnu/krb-standalone/v4krb524d.exp b/src/tests/dejagnu/krb-standalone/v4krb524d.exp index 5c30c5f4e..d78f14ba3 100644 --- a/src/tests/dejagnu/krb-standalone/v4krb524d.exp +++ b/src/tests/dejagnu/krb-standalone/v4krb524d.exp @@ -49,7 +49,7 @@ proc start_k524_daemon { } { set k524d_pid [exp_pid] # Give the krb524d daemon a few seconds to get set up. - catch "exec sleep 2" + sleep 2 } # A procedure to stop the krb524 daemon. -- 2.26.2