Merge

2015-07-23 15:25:30 +00:00 · 2015-07-23 15:25:30 +00:00 · ad592d234f
commit ad592d234f
parent 2155377556 b66a26f3b1
46 changed files with 47 additions and 3 deletions
--- a/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh
+++ b/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh
@ -30,6 +30,7 @@
 #           TTY: dump <ArrayReference> command not implemented.
 #  @author Tim Bell
 #
+#  @key intermittent
 #  @run shell ArrayLengthDumpTest.sh
 #
 classname=ArrayLengthDumpTarg
--- a/jdk/test/com/sun/jdi/BreakpointTest.java
+++ b/jdk/test/com/sun/jdi/BreakpointTest.java
@ -28,6 +28,7 @@
 *
 *  @author jjh
 *
+ *  @key intermittent
 *  @modules jdk.jdi
 *  @run build TestScaffold VMConnection TargetListener TargetAdapter
 *  @run compile -g BreakpointTest.java
@ -45,7 +46,7 @@ import java.util.*;
 // the debuggee, waits a bit, and enables the bkpt again.

 class BreakpointTarg {
-    public final static int BKPT_LINE = 55;
+    public final static int BKPT_LINE = 56;
            // LINE NUMBER SENSITIVE

    public static long count;
--- a/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
+++ b/jdk/test/com/sun/jdi/BreakpointWithFullGC.sh
@ -29,6 +29,7 @@
 #  @author dcubed (based on the test program posted to the following
 #  Eclipse thread https://bugs.eclipse.org/bugs/show_bug.cgi?id=279137)
 #
+#  @key intermittent
 #  @run shell BreakpointWithFullGC.sh

 compileOptions=-g
--- a/jdk/test/com/sun/jdi/CatchAllTest.sh
+++ b/jdk/test/com/sun/jdi/CatchAllTest.sh
@ -29,6 +29,7 @@
 #  @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException
 #  @author Tim Bell
 #
+#  @key intermittent
 #  @run shell CatchAllTest.sh
 #
 classname=CatchAllTestTarg
--- a/jdk/test/com/sun/jdi/CatchCaughtTest.sh
+++ b/jdk/test/com/sun/jdi/CatchCaughtTest.sh
@ -29,6 +29,7 @@
 #  @summary TTY: 'catch caught' with no class pattern throws NullPointerException
 #  @author Tim Bell
 #
+#  @key intermittent
 #  @run shell CatchCaughtTest.sh
 #
 classname=CatchCaughtTestTarg
--- a/jdk/test/com/sun/jdi/CatchPatternTest.sh
+++ b/jdk/test/com/sun/jdi/CatchPatternTest.sh
@ -28,6 +28,7 @@
 #  @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results
 #  @author Tim Bell
 #
+#  @key intermittent
 #  @run shell CatchPatternTest.sh
 classname=CatchPatternTestTarg
 createJavaFile()
--- a/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh
+++ b/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh
@ -28,6 +28,7 @@
 #  @bug 4507088
 #  @summary TTY: Add a comment delimiter to the jdb command set
 #  @author Tim Bell
+#  @key intermittent
 #  @run shell CommandCommentDelimiter.sh
 #

--- a/jdk/test/com/sun/jdi/DeoptimizeWalk.sh
+++ b/jdk/test/com/sun/jdi/DeoptimizeWalk.sh
@ -27,6 +27,7 @@
 #  @bug 4525714
 #  @summary jtreg test PopAsynchronousTest fails in build 85 with -Xcomp
 #  @author Jim Holmlund/Swamy Venkataramanappa
+#  @key intermittent
 #  @run shell DeoptimizeWalk.sh

 #  This is another test of the same bug.  The bug occurs when trying
--- a/jdk/test/com/sun/jdi/ExceptionEvents.java
+++ b/jdk/test/com/sun/jdi/ExceptionEvents.java
@ -28,6 +28,7 @@
 *
 *  @author Robert Field
 *
+ *  @key intermittent
 *  @modules jdk.jdi
 *  @run build TestScaffold VMConnection
 *  @run compile -g ExceptionEvents.java
--- a/jdk/test/com/sun/jdi/JdbExprTest.sh
+++ b/jdk/test/com/sun/jdi/JdbExprTest.sh
@ -26,6 +26,7 @@
 #  @test
 #  @bug 4660158
 #  @author Staffan Larsen
+#  @key intermittent
 #  @run shell JdbExprTest.sh

 # These are variables that can be set to control execution
--- a/jdk/test/com/sun/jdi/JdbMissStep.sh
+++ b/jdk/test/com/sun/jdi/JdbMissStep.sh
@ -28,6 +28,7 @@
 #  @summary REGRESSION: jdb / jdi not stopping at some breakpoints and steps in j2sdk1.4.
 #  @author Jim Holmlund
 #
+#  @key intermittent
 #  @run shell JdbMissStep.sh

 # These are variables that can be set to control execution
--- a/jdk/test/com/sun/jdi/JdbVarargsTest.sh
+++ b/jdk/test/com/sun/jdi/JdbVarargsTest.sh
@ -29,6 +29,7 @@
 #
 #  @author jjh
 #
+#  @key intermittent
 #  @run shell JdbVarargsTest.sh

 classname=JdbVarargsTest
--- a/jdk/test/com/sun/jdi/MixedSuspendTest.sh
+++ b/jdk/test/com/sun/jdi/MixedSuspendTest.sh
@ -29,6 +29,7 @@
 # 
 #  @author Jim Holmlund
 # 
+#  @key intermittent
 #  @modules jdk.jdi
 #  @run build TestScaffold VMConnection TargetListener TargetAdapter
 #  @run shell MixedSuspendTest.sh
--- a/jdk/test/com/sun/jdi/NotAField.sh
+++ b/jdk/test/com/sun/jdi/NotAField.sh
@ -29,6 +29,7 @@
 #  @summary TTY: NullPointerException at
 #           com.sun.tools.jdi.MirrorImpl.validateMirrors
 #  @author Tim Bell
+#  @key intermittent
 #  @run shell NotAField.sh
 #

--- a/jdk/test/com/sun/jdi/RedefineAbstractClass.sh
+++ b/jdk/test/com/sun/jdi/RedefineAbstractClass.sh
@ -31,6 +31,7 @@
 #   methods are called.
 # @author Daniel D. Daugherty
 #
+# @key intermittent
 # @run shell RedefineAbstractClass.sh

 compileOptions=-g
--- a/jdk/test/com/sun/jdi/RedefineAnnotation.sh
+++ b/jdk/test/com/sun/jdi/RedefineAnnotation.sh
@ -28,6 +28,7 @@
 #  @summary Redefine a class that has an annotation and verify that the
 #    new annotation is returned.
 #
+#  @key intermittent
 #  @run shell RedefineAnnotation.sh

 compileOptions=-g
--- a/jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh
+++ b/jdk/test/com/sun/jdi/RedefineClearBreakpoint.sh
@ -27,6 +27,7 @@
 #  @bug 4705330
 #  @summary Netbeans Fix and Continue crashes JVM
 #  @author Jim Holmlund/Swamy Venkataramanappa
+#  @key intermittent
 #  @run shell RedefineClearBreakpoint.sh

 #  The failure occurs after a bkpt is set and then cleared
--- a/jdk/test/com/sun/jdi/RedefineException.sh
+++ b/jdk/test/com/sun/jdi/RedefineException.sh
@ -28,6 +28,7 @@
 #  @summary The VM crashes when a method in a redefined class throws an exception.
 #  @author Jim Holmlund
 #
+#  @key intermittent
 #  @run shell RedefineException.sh

 # This is another symptomm of 4559100
--- a/jdk/test/com/sun/jdi/RedefineFinal.sh
+++ b/jdk/test/com/sun/jdi/RedefineFinal.sh
@ -27,6 +27,7 @@
 #  @bug 4788344
 #  @summary RedefineClasses is an apparent no-op if instance method is final
 #
+#  @key intermittent
 #  @run shell RedefineFinal.sh

 compileOptions=-g
--- a/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh
+++ b/jdk/test/com/sun/jdi/RedefineIntConstantToLong.sh
@ -27,6 +27,7 @@
 #  @bug 6394084
 #  @summary Redefine class can't handle addition of 64 bit constants in JDK1.5.0_05
 #
+#  @key intermittent
 #  @run shell RedefineIntConstantToLong.sh

 compileOptions=-g
--- a/jdk/test/com/sun/jdi/RedefinePop.sh
+++ b/jdk/test/com/sun/jdi/RedefinePop.sh
@ -30,6 +30,7 @@
 #
 #  The failure occurs with debug java when the pop deletes the
 #  line that called the method which is being popped.
+#  @key intermittent
 #  @run shell RedefinePop.sh


--- a/jdk/test/com/sun/jdi/RedefineStep.sh
+++ b/jdk/test/com/sun/jdi/RedefineStep.sh
@ -27,6 +27,7 @@
 #  @bug 4689395
 #  @summary "step over" after a class is redefined acts like "step out"
 #  @author Jim Holmlund
+#  @key intermittent
 #  @run shell RedefineStep.sh
 #

--- a/jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh
+++ b/jdk/test/com/sun/jdi/RedefineTTYLineNumber.sh
@ -27,6 +27,7 @@
 #  @bug 4660756
 #  @summary TTY: Need to clear source cache after doing a redefine class
 #  @author Jim Holmlund
+#  @key intermittent
 #  @run shell/timeout=240 RedefineTTYLineNumber.sh

 #set -x
--- a/jdk/test/com/sun/jdi/SimulResumerTest.java
+++ b/jdk/test/com/sun/jdi/SimulResumerTest.java
@ -28,6 +28,7 @@
 *
 *  @author jjh
 *
+ *  @key intermittent
 *  @modules jdk.jdi
 *  @run build TestScaffold VMConnection TargetListener TargetAdapter
 *  @run compile -g SimulResumerTest.java
--- a/jdk/test/com/sun/jdi/StringConvertTest.sh
+++ b/jdk/test/com/sun/jdi/StringConvertTest.sh
@ -29,6 +29,7 @@
 #           2. TTY: run on expression evaluation
 #  @author jim/suvasis mukherjee
 #
+#  @key intermittent
 #  @run shell StringConvertTest.sh

 #  Run this script to see the bug.  See comments at the end
--- a/jdk/test/com/sun/jdi/sde/FilterMangleTest.java
+++ b/jdk/test/com/sun/jdi/sde/FilterMangleTest.java
@ -5,6 +5,7 @@
 *
 *  @author Robert Field / Jim Holmlund
 *
+ *  @key intermittent
 *  @library ..
 *  @modules jdk.jdi
 *  @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
--- a/jdk/test/com/sun/tools/attach/BasicTests.java
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java
@ -41,7 +41,7 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
 * @test
 * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757
 * @summary Basic unit tests for the VM attach mechanism.
- * @modules jdk.jartool/sun.tools.jar
+ * @key intermittent
 * @library /lib/testlibrary
 * @modules java.instrument
 *          java.management
--- a/jdk/test/java/lang/ClassLoader/Assert.java
+++ b/jdk/test/java/lang/ClassLoader/Assert.java
@ -28,7 +28,7 @@
 * @run main/othervm Assert
 * @summary Test the assertion facility
 * @author Mike McCloskey
- * @key randomness
+ * @key randomness intermittent
 */

 import package1.*;
--- a/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh
+++ b/jdk/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh
@ -26,6 +26,7 @@
 # @summary Test non US-ASCII characters in the value of the Boot-Class-Path
 #          attribute.
 #
+# @key intermittent
 # @modules java.instrument
 # @run shell/timeout=240 BootClassPathTest.sh

--- a/jdk/test/java/lang/instrument/ManifestTest.sh
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh
@ -26,6 +26,7 @@
 # @summary JLI JAR manifest processing should ignore leading and trailing white space.
 # @author Daniel D. Daugherty
 #
+# @key intermittent
 # @modules java.instrument
 # @run build ManifestTestApp ExampleForBootClassPath
 # @run shell/timeout=900 ManifestTest.sh
--- a/jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java
+++ b/jdk/test/java/lang/instrument/PremainClass/InheritAgent0101.java
@ -27,6 +27,7 @@
 * @summary test config (0,1,0,1): inherited 1-arg and declared 1-arg in agent class
 * @author Daniel D. Daugherty, Sun Microsystems
 *
+ * @key intermittent
 * @run shell ../MakeJAR3.sh InheritAgent0101
 * @run main/othervm -javaagent:InheritAgent0101.jar DummyMain
 */
--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh
@ -26,6 +26,7 @@
 # @summary Redefine a big class.
 # @author Daniel D. Daugherty
 #
+# @key intermittent
 # @modules java.instrument
 # @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
 # @run build BigClass RedefineBigClassApp NMTHelper
--- a/jdk/test/java/lang/instrument/RetransformBigClass.sh
+++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh
@ -26,6 +26,7 @@
 # @summary Retransform a big class.
 # @author Daniel D. Daugherty
 #
+# @key intermittent
 # @modules java.instrument
 # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
 # @run build BigClass RetransformBigClassApp NMTHelper
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
@ -27,6 +27,7 @@
 * @summary Basic unit test of ThreadMXBean.getAllThreadIds()
 * @author  Alexei Guibadoulline and Mandy Chung
 *
+ * @key intermittent
 * @modules java.management
 * @run main/othervm AllThreadIds
 */
--- a/jdk/test/javax/management/monitor/ReflectionExceptionTest.java
+++ b/jdk/test/javax/management/monitor/ReflectionExceptionTest.java
@ -27,6 +27,7 @@
 * @summary Test that the jmx.monitor.error.runtime monitor notification
 *          is emitted when getAttribute throws ReflectionException.
 * @author Luis-Miguel Alventosa
+ * @key intermittent
 * @modules java.management
 * @run clean ReflectionExceptionTest MBeanServerBuilderImpl
 *            MBeanServerForwarderInvocationHandler
--- a/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java
+++ b/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java
@ -27,6 +27,7 @@
 * @summary Test that no locks are held when a monitor attribute is sampled
 * or notif delivered.
 * @author Eamonn McManus
+ * @key intermittent
 * @modules java.management
 * @run clean StringMonitorDeadlockTest
 * @run build StringMonitorDeadlockTest
--- a/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java
+++ b/jdk/test/javax/management/mxbean/GenericArrayTypeTest.java
@ -26,6 +26,7 @@
 * @bug 6292705
 * @summary Test support for arrays in parameterized types.
 * @author Luis-Miguel Alventosa
+ * @key intermittent
 * @modules java.management
 * @run clean GenericArrayTypeTest
 * @run build GenericArrayTypeTest
--- a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
+++ b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java
@ -26,6 +26,7 @@
 * @bug 4940957 8025205
 * @summary Tests behaviour when connections break
 * @author Eamonn McManus
+ * @key intermittent
 * @modules java.management
 * @run clean BrokenConnectionTest
 * @run build BrokenConnectionTest
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
+++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java
@ -27,6 +27,7 @@
 * @summary Check the emission of notifications when a Security Manager is
 * installed. Test the property "jmx.remote.x.check.notification.emission".
 * @author Luis-Miguel Alventosa
+ * @key intermittent
 * @modules java.management
 * @run clean NotificationEmissionTest
 * @run build NotificationEmissionTest
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
+++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh
@ -26,6 +26,7 @@
 # @bug     6528083
 # @summary Test RMI Bootstrap
 #
+# @key intermittent
 # @library /lib/testlibrary
 # @modules java.management/sun.management
 #          java.management/sun.management.jmxremote
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java
@ -40,6 +40,7 @@ import jdk.testlibrary.ProcessTools;
 * @bug 8075926
 * @summary Makes sure that the current management agent status is reflected
 *          in the related performance counters.
+ * @key intermittent
 * @library /lib/testlibrary
 * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd
 * @run testng/othervm -XX:+UsePerfData JMXStatusPerfCountersTest
--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java
@ -36,6 +36,7 @@ import jdk.testlibrary.ProcessTools;
 * @test
 * @bug 6321286
 * @summary Unit test for jmap utility
+ * @key intermittent
 * @library /lib/testlibrary
 * @library /../../test/lib/share/classes
 * @modules java.management
--- a/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java
+++ b/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java
@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 4990825
+ * @key intermittent
 * @library /lib/testlibrary
 * @modules java.management
 * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
--- a/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
+++ b/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java
@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 4990825 7092186
+ * @key intermittent
 * @library /lib/testlibrary
 * @modules java.management
 * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
--- a/jdk/test/sun/tools/jstatd/TestJstatdPort.java
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPort.java
@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 4990825
+ * @key intermittent
 * @library /lib/testlibrary
 * @modules java.management
 * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
--- a/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java
+++ b/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java
@ -24,6 +24,7 @@
 /*
 * @test
 * @bug 4990825
+ * @key intermittent
 * @library /lib/testlibrary
 * @modules java.management
 * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser