changeset 137:ebe8adae32b9

6528548: 4/4 NativeMethodPrefixAgent.java times out intermittently in nightly Summary: Increase timeouts for tasks that take > 10 seconds on a 4-way Ultra-80 with all local resources. Reviewed-by: sspitsyn
author dcubed
date Mon, 24 Mar 2008 16:04:07 -0700
parents e6e301984a4a
children 31959ddaf501
files test/java/lang/instrument/BootClassPath/BootClassPathTest.sh test/java/lang/instrument/NativeMethodPrefixAgent.java test/java/lang/instrument/RetransformAgent.java test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh
diffstat 5 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Mon Mar 24 15:42:37 2008 -0700
+++ b/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh	Mon Mar 24 16:04:07 2008 -0700
@@ -25,6 +25,8 @@
 # @bug 5055293
 # @summary Test non US-ASCII characters in the value of the Boot-Class-Path
 #          attribute.
+#
+# @run shell/timeout=240 BootClassPathTest.sh
 
 if [ "${TESTJAVA}" = "" ]
 then
--- a/test/java/lang/instrument/NativeMethodPrefixAgent.java	Mon Mar 24 15:42:37 2008 -0700
+++ b/test/java/lang/instrument/NativeMethodPrefixAgent.java	Mon Mar 24 16:04:07 2008 -0700
@@ -27,7 +27,7 @@
  * @summary test setNativeMethodPrefix
  * @author Robert Field, Sun Microsystems
  *
- * @run shell MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
+ * @run shell/timeout=240 MakeJAR2.sh NativeMethodPrefixAgent NativeMethodPrefixApp 'Can-Retransform-Classes: true' 'Can-Set-Native-Method-Prefix: true'
  * @run main/othervm -javaagent:NativeMethodPrefixAgent.jar NativeMethodPrefixApp
  */
 
--- a/test/java/lang/instrument/RetransformAgent.java	Mon Mar 24 15:42:37 2008 -0700
+++ b/test/java/lang/instrument/RetransformAgent.java	Mon Mar 24 16:04:07 2008 -0700
@@ -27,7 +27,7 @@
  * @summary test retransformClasses
  * @author Robert Field, Sun Microsystems
  *
- * @run shell MakeJAR2.sh RetransformAgent RetransformApp 'Can-Retransform-Classes: true'
+ * @run shell/timeout=240 MakeJAR2.sh RetransformAgent RetransformApp 'Can-Retransform-Classes: true'
  * @run main/othervm -javaagent:RetransformAgent.jar RetransformApp
  */
 
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Mon Mar 24 15:42:37 2008 -0700
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh	Mon Mar 24 16:04:07 2008 -0700
@@ -26,7 +26,7 @@
 # @summary Unit tests for appendToBootstrapClassLoaderSearch and
 #   appendToSystemClasLoaderSearch methods.
 #
-# @run shell CircularityErrorTest.sh
+# @run shell/timeout=240 CircularityErrorTest.sh
 
 if [ "${TESTSRC}" = "" ]
 then
--- a/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Mon Mar 24 15:42:37 2008 -0700
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh	Mon Mar 24 16:04:07 2008 -0700
@@ -30,7 +30,7 @@
 #   appendToSystemClasLoaderSearch methods.
 #
 # @build Agent AgentSupport BootSupport BasicTest PrematureLoadTest DynamicTest
-# @run shell run_tests.sh
+# @run shell/timeout=240 run_tests.sh
 
 if [ "${TESTSRC}" = "" ]
 then