changeset 1542:1c9cfd050949

Merge
author tbell
date Sun, 02 Aug 2009 10:07:06 -0700
parents 358ec67d3252 (current diff) 2536ab04dc68 (diff)
children c390fd8fa885 ebc7d26588b8
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
 #