Merge
authortbell
Sun Aug 02 10:07:06 2009 -0700 (7 months ago)
changeset 14551c9cfd050949
parent 1454358ec67d3252
parent 14292536ab04dc68
child 1456c390fd8fa885
child 1525ebc7d26588b8
Merge
--- a/test/sun/security/tools/keytool/standard.sh Fri Jul 31 17:19:38 2009 -0700
+++ b/test/sun/security/tools/keytool/standard.sh Sun Aug 02 10:07:06 2009 -0700
@@ -24,6 +24,7 @@
# @test
# @summary (almost) all keytool behaviors
# @author Weijun Wang
+# @run shell/timeout=600 standard.sh
#
# This test is always excecuted.
#