Merge
authortbell
Sun, 02 Aug 2009 10:07:06 -0700
changeset 3428 3ddda254a162
parent 3426 86deabfb7cbd (current diff)
parent 3427 bc53e52c4ba6 (diff)
child 3429 91b348538ab8
child 3476 b27b095ea77b
Merge
--- a/jdk/test/sun/security/tools/keytool/standard.sh	Fri Jul 31 17:19:38 2009 -0700
+++ b/jdk/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.
 #