# HG changeset patch # User iignatyev # Date 1488896133 28800 # Tue Mar 07 06:15:33 2017 -0800 # Node ID 1fa07b25677620287dbe0917cdb38698ee172bc5 # Parent b35a2a9414982a474df917018dcd4733eedd36e4 8176176: fix @modules in jdk_svc tests Reviewed-by: duke diff --git a/test/com/sun/jdi/AcceptTimeout.java b/test/com/sun/jdi/AcceptTimeout.java --- a/test/com/sun/jdi/AcceptTimeout.java +++ b/test/com/sun/jdi/AcceptTimeout.java @@ -24,8 +24,7 @@ /* @test * @bug 6198277 * @summary Test that each ListeningConnector that supports a "timeout" argument will - * timeout with TransportTimeoutException - * @modules jdk.jdi + * timeout with TransportTimeoutException */ import com.sun.jdi.Bootstrap; import com.sun.jdi.connect.Connector; diff --git a/test/com/sun/jdi/AccessSpecifierTest.java b/test/com/sun/jdi/AccessSpecifierTest.java --- a/test/com/sun/jdi/AccessSpecifierTest.java +++ b/test/com/sun/jdi/AccessSpecifierTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4359628 - * @summary Test fix for JDI: methods Accessible.is...() lie about array types + * @test + * @bug 4359628 + * @summary Test fix for JDI: methods Accessible.is...() lie about array types + * @author Tim Bell * - * @author Tim Bell - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g AccessSpecifierTest.java - * @run driver AccessSpecifierTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g AccessSpecifierTest.java + * @run driver AccessSpecifierTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/AfterThreadDeathTest.java b/test/com/sun/jdi/AfterThreadDeathTest.java --- a/test/com/sun/jdi/AfterThreadDeathTest.java +++ b/test/com/sun/jdi/AfterThreadDeathTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4364671 - * @summary Creating a StepRequest on a nonexistant thread fails + * @test + * @bug 4364671 + * @summary Creating a StepRequest on a nonexistant thread fails + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g AfterThreadDeathTest.java - * @run driver AfterThreadDeathTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g AfterThreadDeathTest.java + * @run driver AfterThreadDeathTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/AllLineLocations.java b/test/com/sun/jdi/AllLineLocations.java --- a/test/com/sun/jdi/AllLineLocations.java +++ b/test/com/sun/jdi/AllLineLocations.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4248728 - * @summary Test ReferenceType.allLineLocations - * @author Gordon Hirsch + * @test + * @bug 4248728 + * @summary Test ReferenceType.allLineLocations + * @author Gordon Hirsch * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g RefTypes.java - * @run build AllLineLocations + * @run build JDIScaffold VMConnection + * @run compile -g RefTypes.java + * @run build AllLineLocations * - * @run driver AllLineLocations RefTypes + * @run driver AllLineLocations RefTypes */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/ArgumentValuesTest.java b/test/com/sun/jdi/ArgumentValuesTest.java --- a/test/com/sun/jdi/ArgumentValuesTest.java +++ b/test/com/sun/jdi/ArgumentValuesTest.java @@ -1,13 +1,38 @@ -/** hard coded linenumbers in other tests - DO NOT CHANGE - * @test/nodynamiccopyright/ - * @bug 4490824 - * @summary JDI: provide arguments when no debug attributes present +/* + * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * @author jjh + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. * - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile ArgumentValuesTest.java - * @run driver ArgumentValuesTest + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// THIS TEST IS LINE NUMBER SENSITIVE + +/** + * @test + * @bug 4490824 + * @summary JDI: provide arguments when no debug attributes present + * + * @author jjh + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile ArgumentValuesTest.java + * @run driver ArgumentValuesTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; @@ -35,26 +60,26 @@ static List intList; public static void noArgs() { - int index = 0; // line 38 + int index = 0; // line NO_ARGS_LINE_1 } public static void allArgs(char p_char, byte p_byte, short p_short, int p_int, long p_long, float p_float, double p_double, int p_iarray[], int p_marray[][], String p_sarray1[], String p_string) { - int index = 0; // line 45 + int index = 0; // line ALL_ARGS_LINE_1 } public static void varArgs(String ... p1) { - int index = 0; // line 49 + int index = 0; // line VAR_ARGS_LINE_1 } public static void genericArgs(List p1) { - int index = 0; // line 53 + int index = 0; // line GENERIC_ARGS_LINE_1 } public void instanceMethod(char p_char, byte p_byte) { - int index = 0; // line 57 + int index = 0; // line INSTANCE_METHOD_LINE_1 } public static void main(String[] args) { @@ -81,6 +106,12 @@ /********** test program **********/ public class ArgumentValuesTest extends TestScaffold { + static final int NO_ARGS_LINE_1 = 63; + static final int ALL_ARGS_LINE_1 = 70; + static final int VAR_ARGS_LINE_1 = 74; + static final int GENERIC_ARGS_LINE_1 = 78; + static final int INSTANCE_METHOD_LINE_1 = 82; + // Must be in same order as args to allArgs(....) String fieldNames[] = {"s_char1", "s_byte1", "s_short1", "s_int1", "s_long1", "s_float1", "s_double1", "s_iarray1", @@ -118,7 +149,7 @@ { System.out.println("----- Testing each type of arg"); - bpe = resumeTo("ArgumentValuesTarg", 45); + bpe = resumeTo("ArgumentValuesTarg", ALL_ARGS_LINE_1); StackFrame frame = bpe.thread().frame(0); Method mmm = frame.location().method(); @@ -147,7 +178,7 @@ // a method with no params { System.out.println("----- Testing no args"); - bpe = resumeTo("ArgumentValuesTarg", 38); + bpe = resumeTo("ArgumentValuesTarg", NO_ARGS_LINE_1); StackFrame frame = bpe.thread().frame(0); Method mmm = frame.location().method(); @@ -165,7 +196,7 @@ // as a String[3] in the method. { System.out.println("----- Testing var args"); - bpe = resumeTo("ArgumentValuesTarg", 49); + bpe = resumeTo("ArgumentValuesTarg", VAR_ARGS_LINE_1); StackFrame frame = bpe.thread().frame(0); Method mmm = frame.location().method(); @@ -199,7 +230,7 @@ // a method with with one generic param { System.out.println("----- Testing generic args"); - bpe = resumeTo("ArgumentValuesTarg", 53); + bpe = resumeTo("ArgumentValuesTarg", GENERIC_ARGS_LINE_1); StackFrame frame = bpe.thread().frame(0); Method mmm = frame.location().method(); @@ -224,7 +255,7 @@ // test instance method call { System.out.println("----- Testing instance method call"); - bpe = resumeTo("ArgumentValuesTarg", 57); + bpe = resumeTo("ArgumentValuesTarg", INSTANCE_METHOD_LINE_1); StackFrame frame = bpe.thread().frame(0); Method mmm = frame.location().method(); diff --git a/test/com/sun/jdi/ArrayLengthDumpTest.sh b/test/com/sun/jdi/ArrayLengthDumpTest.sh --- a/test/com/sun/jdi/ArrayLengthDumpTest.sh +++ b/test/com/sun/jdi/ArrayLengthDumpTest.sh @@ -24,14 +24,14 @@ # # -# @test -# @bug 4422141 4695338 -# @summary TTY: .length field for arrays in print statements in jdb not recognized -# TTY: dump command not implemented. -# @author Tim Bell +# @test +# @bug 4422141 4695338 +# @key intermittent +# @summary TTY: .length field for arrays in print statements in jdb not recognized +# TTY: dump command not implemented. +# @author Tim Bell # -# @key intermittent -# @run shell ArrayLengthDumpTest.sh +# @run shell ArrayLengthDumpTest.sh # classname=ArrayLengthDumpTarg @@ -98,7 +98,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/ArrayRangeTest.java b/test/com/sun/jdi/ArrayRangeTest.java --- a/test/com/sun/jdi/ArrayRangeTest.java +++ b/test/com/sun/jdi/ArrayRangeTest.java @@ -22,18 +22,16 @@ */ /** - * @test - * @bug 4439631 - * @bug 4448721 - * @bug 4448603 - * @summary Test access to ranges within ArrayReferences + * @test + * @bug 4439631 + * @bug 4448721 + * @bug 4448603 + * @summary Test access to ranges within ArrayReferences + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ArrayRangeTest.java - * @run driver ArrayRangeTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ArrayRangeTest.java + * @run driver ArrayRangeTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/BacktraceFieldTest.java b/test/com/sun/jdi/BacktraceFieldTest.java --- a/test/com/sun/jdi/BacktraceFieldTest.java +++ b/test/com/sun/jdi/BacktraceFieldTest.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4446677 - * @bug 8158237 - * @summary debuggee used to crash when debugging under jbuilder + * @test + * @bug 4446677 + * @bug 8158237 + * @summary debuggee used to crash when debugging under jbuilder + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g BacktraceFieldTest.java - * @run driver BacktraceFieldTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g BacktraceFieldTest.java + * @run driver BacktraceFieldTest */ /* diff --git a/test/com/sun/jdi/BadAgentPath.java b/test/com/sun/jdi/BadAgentPath.java --- a/test/com/sun/jdi/BadAgentPath.java +++ b/test/com/sun/jdi/BadAgentPath.java @@ -32,6 +32,7 @@ * * @library /lib/testlibrary * @modules java.management + * * @build jdk.testlibrary.* * @build BadAgentPath * @run driver BadAgentPath diff --git a/test/com/sun/jdi/BadHandshakeTest.java b/test/com/sun/jdi/BadHandshakeTest.java --- a/test/com/sun/jdi/BadHandshakeTest.java +++ b/test/com/sun/jdi/BadHandshakeTest.java @@ -42,10 +42,11 @@ /* @test * @bug 6306165 6432567 * @summary Check that a bad handshake doesn't cause a debuggee to abort + * * @library /lib/testlibrary - * * @modules java.management * jdk.jdi + * * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0 * @run driver BadHandshakeTest */ diff --git a/test/com/sun/jdi/BreakpointTest.java b/test/com/sun/jdi/BreakpointTest.java --- a/test/com/sun/jdi/BreakpointTest.java +++ b/test/com/sun/jdi/BreakpointTest.java @@ -21,19 +21,20 @@ * questions. */ +// THIS TEST IS LINE NUMBER SENSITIVE + /** - * @test - * @bug 6496524 - * @summary Setting breakpoint in jdb crashes Hotspot JVM + * @test + * @bug 6496524 + * @key intermittent + * @summary Setting breakpoint in jdb crashes Hotspot JVM + * @author jjh * - * @author jjh - * - * @key intermittent - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g BreakpointTest.java - * @run driver BreakpointTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g BreakpointTest.java + * @run driver BreakpointTest */ + import com.sun.jdi.*; import com.sun.jdi.event.*; import com.sun.jdi.request.*; @@ -47,7 +48,6 @@ class BreakpointTarg { public final static int BKPT_LINE = 56; - // LINE NUMBER SENSITIVE public static long count; static void doit() { diff --git a/test/com/sun/jdi/BreakpointWithFullGC.sh b/test/com/sun/jdi/BreakpointWithFullGC.sh --- a/test/com/sun/jdi/BreakpointWithFullGC.sh +++ b/test/com/sun/jdi/BreakpointWithFullGC.sh @@ -23,14 +23,14 @@ # questions. # -# @test -# @bug 6862295 -# @summary Verify breakpoints still work after a full GC. -# @author dcubed (based on the test program posted to the following -# Eclipse thread https://bugs.eclipse.org/bugs/show_bug.cgi?id=279137) +# @test +# @bug 6862295 +# @key intermittent +# @summary Verify breakpoints still work after a full GC. +# @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 +# @run shell BreakpointWithFullGC.sh compileOptions=-g # Hijacking the mode parameter to make sure we use a small amount diff --git a/test/com/sun/jdi/CatchAllTest.sh b/test/com/sun/jdi/CatchAllTest.sh --- a/test/com/sun/jdi/CatchAllTest.sh +++ b/test/com/sun/jdi/CatchAllTest.sh @@ -24,13 +24,13 @@ # # -# @test -# @bug 4749692 -# @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException -# @author Tim Bell +# @test +# @bug 4749692 +# @key intermittent +# @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException +# @author Tim Bell # -# @key intermittent -# @run shell CatchAllTest.sh +# @run shell CatchAllTest.sh # classname=CatchAllTestTarg @@ -76,7 +76,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/CatchCaughtTest.sh b/test/com/sun/jdi/CatchCaughtTest.sh --- a/test/com/sun/jdi/CatchCaughtTest.sh +++ b/test/com/sun/jdi/CatchCaughtTest.sh @@ -24,13 +24,13 @@ # # -# @test -# @bug 4788864 -# @summary TTY: 'catch caught' with no class pattern throws NullPointerException -# @author Tim Bell +# @test +# @bug 4788864 +# @key intermittent +# @summary TTY: 'catch caught' with no class pattern throws NullPointerException +# @author Tim Bell # -# @key intermittent -# @run shell CatchCaughtTest.sh +# @run shell CatchCaughtTest.sh # classname=CatchCaughtTestTarg @@ -67,7 +67,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/CatchPatternTest.sh b/test/com/sun/jdi/CatchPatternTest.sh --- a/test/com/sun/jdi/CatchPatternTest.sh +++ b/test/com/sun/jdi/CatchPatternTest.sh @@ -23,13 +23,13 @@ # questions. # -# @test -# @bug 4671838 -# @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results -# @author Tim Bell +# @test +# @bug 4671838 +# @key intermittent +# @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results +# @author Tim Bell # -# @key intermittent -# @run shell CatchPatternTest.sh +# @run shell CatchPatternTest.sh classname=CatchPatternTestTarg createJavaFile() { @@ -108,7 +108,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/ClassLoaderClassesTest.java b/test/com/sun/jdi/ClassLoaderClassesTest.java --- a/test/com/sun/jdi/ClassLoaderClassesTest.java +++ b/test/com/sun/jdi/ClassLoaderClassesTest.java @@ -27,10 +27,8 @@ * @summary Test ClassLoaderReference.visibleClasses() which is * a direct pass-through of the JVMDI function GetClassLoaderClasses * for inclusion of primitive arrays. - * * @author Robert Field * - * @modules jdk.jdi * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g ClassLoaderClassesTest.java * @run driver ClassLoaderClassesTest diff --git a/test/com/sun/jdi/ClassesByName.java b/test/com/sun/jdi/ClassesByName.java --- a/test/com/sun/jdi/ClassesByName.java +++ b/test/com/sun/jdi/ClassesByName.java @@ -24,16 +24,14 @@ /** * @test * @bug 4287992 + * @summary ClassesByName verifies that all the classes in the + * loaded class list can be found with classesByName.. * @author Robert Field * - * @modules jdk.jdi * @run build JDIScaffold VMConnection * @run compile -g HelloWorld.java * @run build ClassesByName * - * @summary ClassesByName verifies that all the classes in the - * loaded class list can be found with classesByName.. - * * @run driver ClassesByName HelloWorld */ import com.sun.jdi.*; diff --git a/test/com/sun/jdi/ClassesByName2Test.java b/test/com/sun/jdi/ClassesByName2Test.java --- a/test/com/sun/jdi/ClassesByName2Test.java +++ b/test/com/sun/jdi/ClassesByName2Test.java @@ -25,10 +25,8 @@ * @test * @bug 4406439 4925740 * @summary ClassesByName2 verifies that all the classes in the loaded class list can be found with classesByName.. - * * @author Tim Bell (based on ClassesByName by Robert Field) * - * @modules jdk.jdi * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -g ClassesByName2Test.java * @run driver ClassesByName2Test diff --git a/test/com/sun/jdi/CommandCommentDelimiter.sh b/test/com/sun/jdi/CommandCommentDelimiter.sh --- a/test/com/sun/jdi/CommandCommentDelimiter.sh +++ b/test/com/sun/jdi/CommandCommentDelimiter.sh @@ -24,12 +24,13 @@ # # -# @test -# @bug 4507088 -# @summary TTY: Add a comment delimiter to the jdb command set -# @author Tim Bell -# @key intermittent -# @run shell CommandCommentDelimiter.sh +# @test +# @bug 4507088 +# @key intermittent +# @summary TTY: Add a comment delimiter to the jdb command set +# @author Tim Bell +# +# @run shell CommandCommentDelimiter.sh # createJavaFile() @@ -70,7 +71,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/CompatibleConnectors.java b/test/com/sun/jdi/CompatibleConnectors.java --- a/test/com/sun/jdi/CompatibleConnectors.java +++ b/test/com/sun/jdi/CompatibleConnectors.java @@ -27,7 +27,6 @@ * * This test checks that VirtualMachineManager creates Connectors that * are "compatible" those created by 1.4 or earilier releases. - * @modules jdk.jdi */ import com.sun.jdi.*; diff --git a/test/com/sun/jdi/ConnectedVMs.java b/test/com/sun/jdi/ConnectedVMs.java --- a/test/com/sun/jdi/ConnectedVMs.java +++ b/test/com/sun/jdi/ConnectedVMs.java @@ -22,20 +22,18 @@ */ /** - * @test - * @bug 4329140 - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InstTarg.java - * @run driver ConnectedVMs Kill - * @run driver ConnectedVMs Resume-to-exit - * @run driver ConnectedVMs dispose() - * @run driver ConnectedVMs exit() - * + * @test + * @bug 4329140 * @summary ConnectedVMs checks the method * VirtualMachineManager.connectedVirtualMachines() + * @author Robert Field + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InstTarg.java + * @run driver ConnectedVMs Kill + * @run driver ConnectedVMs Resume-to-exit + * @run driver ConnectedVMs dispose() + * @run driver ConnectedVMs exit() */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/ConstantPoolInfo.java b/test/com/sun/jdi/ConstantPoolInfo.java --- a/test/com/sun/jdi/ConstantPoolInfo.java +++ b/test/com/sun/jdi/ConstantPoolInfo.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 5024104 - * @summary Test ReferenceType.majorVersion(), minorVersion, constantPoolCount and ConstantPool apis. + * @test + * @bug 5024104 + * @summary Test ReferenceType.majorVersion(), minorVersion, constantPoolCount and ConstantPool apis. + * @author Swamy Venkataramanappa * - * @author Swamy Venkataramanappa - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection - * @run compile -g ConstantPoolInfo.java - * @run driver ConstantPoolInfo + * @run build TestScaffold VMConnection + * @run compile -g ConstantPoolInfo.java + * @run driver ConstantPoolInfo */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/ConstantPoolInfoGC.java b/test/com/sun/jdi/ConstantPoolInfoGC.java --- a/test/com/sun/jdi/ConstantPoolInfoGC.java +++ b/test/com/sun/jdi/ConstantPoolInfoGC.java @@ -22,16 +22,16 @@ */ /* - * @test - * @bug 6822627 - * @summary Test that ReferenceType.constantPool does not produce an NPE + * @test + * @bug 6822627 + * @summary Test that ReferenceType.constantPool does not produce an NPE + * @author Egor Ushakov * - * @author Egor Ushakov + * @modules jdk.jdi/com.sun.tools.jdi:+open * - * @modules jdk.jdi/com.sun.tools.jdi:+open - * @run build TestScaffold VMConnection - * @run compile -g ConstantPoolInfoGC.java - * @run main/othervm ConstantPoolInfoGC + * @run build TestScaffold VMConnection + * @run compile -g ConstantPoolInfoGC.java + * @run main/othervm ConstantPoolInfoGC */ import com.sun.jdi.ReferenceType; diff --git a/test/com/sun/jdi/CountEvent.java b/test/com/sun/jdi/CountEvent.java --- a/test/com/sun/jdi/CountEvent.java +++ b/test/com/sun/jdi/CountEvent.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4315352 - * @summary disabling EventRequest expired with addCountFilter() throws - * InternalException. + * @test + * @bug 4315352 + * @summary disabling EventRequest expired with addCountFilter() throws + * InternalException. + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetAdapter TargetListener - * @run compile -g CountEvent.java - * @run driver CountEvent + * @run build TestScaffold VMConnection TargetAdapter TargetListener + * @run compile -g CountEvent.java + * @run driver CountEvent */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/CountFilterTest.java b/test/com/sun/jdi/CountFilterTest.java --- a/test/com/sun/jdi/CountFilterTest.java +++ b/test/com/sun/jdi/CountFilterTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4321339 - * @summary Check correct processing of filters after a count filter + * @test + * @bug 4321339 + * @summary Check correct processing of filters after a count filter + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g CountFilterTest.java - * @run driver CountFilterTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g CountFilterTest.java + * @run driver CountFilterTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/DebuggerThreadTest.java b/test/com/sun/jdi/DebuggerThreadTest.java --- a/test/com/sun/jdi/DebuggerThreadTest.java +++ b/test/com/sun/jdi/DebuggerThreadTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4513488 - * @summary Test for JDI: Internal JDI helper threads should setDaemon(true) + * @test + * @bug 4513488 + * @summary Test for JDI: Internal JDI helper threads should setDaemon(true) + * @author Tim Bell * - * @author Tim Bell - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g DebuggerThreadTest.java - * @run driver DebuggerThreadTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g DebuggerThreadTest.java + * @run driver DebuggerThreadTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/DeleteAllBkptsTest.java b/test/com/sun/jdi/DeleteAllBkptsTest.java --- a/test/com/sun/jdi/DeleteAllBkptsTest.java +++ b/test/com/sun/jdi/DeleteAllBkptsTest.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4528948 - * @summary Unable to finish a debugging in NetBeans IDE + * @test + * @bug 4528948 + * @summary Unable to finish a debugging in NetBeans IDE + * @author jjh * - * @author jjh + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g DeleteAllBkptsTest.java - * @run driver DeleteAllBkptsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g DeleteAllBkptsTest.java + * @run driver DeleteAllBkptsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/DeleteEventRequestsTest.java b/test/com/sun/jdi/DeleteEventRequestsTest.java --- a/test/com/sun/jdi/DeleteEventRequestsTest.java +++ b/test/com/sun/jdi/DeleteEventRequestsTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4331872 - * @summary erm.deleteEventRequests(erm.breakpointRequests()) throws exception + * @test + * @bug 4331872 + * @summary erm.deleteEventRequests(erm.breakpointRequests()) throws exception + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g DeleteEventRequestsTest.java - * @run driver DeleteEventRequestsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g DeleteEventRequestsTest.java + * @run driver DeleteEventRequestsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/DeoptimizeWalk.sh b/test/com/sun/jdi/DeoptimizeWalk.sh --- a/test/com/sun/jdi/DeoptimizeWalk.sh +++ b/test/com/sun/jdi/DeoptimizeWalk.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 4525714 -# @summary jtreg test PopAsynchronousTest fails in build 85 with -Xcomp -# @author Jim Holmlund/Swamy Venkataramanappa -# @key intermittent -# @run shell DeoptimizeWalk.sh +# @test +# @bug 4525714 +# @key intermittent +# @summary jtreg test PopAsynchronousTest fails in build 85 with -Xcomp +# @author Jim Holmlund/Swamy Venkataramanappa +# @run shell DeoptimizeWalk.sh # This is another test of the same bug. The bug occurs when trying # to walk the stack of a deoptimized thread. We can do this @@ -96,7 +96,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/DoubleAgentTest.java b/test/com/sun/jdi/DoubleAgentTest.java --- a/test/com/sun/jdi/DoubleAgentTest.java +++ b/test/com/sun/jdi/DoubleAgentTest.java @@ -31,6 +31,7 @@ * * @library /lib/testlibrary * @modules java.management + * * @build jdk.testlibrary.* * @build DoubleAgentTest Exit0 * @run driver DoubleAgentTest diff --git a/test/com/sun/jdi/EarlyReturnNegativeTest.java b/test/com/sun/jdi/EarlyReturnNegativeTest.java --- a/test/com/sun/jdi/EarlyReturnNegativeTest.java +++ b/test/com/sun/jdi/EarlyReturnNegativeTest.java @@ -22,15 +22,14 @@ */ /** - * @test - * @bug 6431735 - * @summary Unexpected ClassCastException in ThreadReference.forceEarlyReturn - * @author Jim Holmlund + * @test + * @bug 6431735 + * @summary Unexpected ClassCastException in ThreadReference.forceEarlyReturn + * @author Jim Holmlund * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g EarlyReturnNegativeTest.java - * @run driver EarlyReturnNegativeTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g EarlyReturnNegativeTest.java + * @run driver EarlyReturnNegativeTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/EarlyReturnTest.java b/test/com/sun/jdi/EarlyReturnTest.java --- a/test/com/sun/jdi/EarlyReturnTest.java +++ b/test/com/sun/jdi/EarlyReturnTest.java @@ -22,22 +22,21 @@ */ /* - * @test - * @bug 6175634 - * @summary Allow early return from methods + * @test + * @bug 6175634 + * @summary Allow early return from methods * - * @bug 6431720 - * @summary Unexpected InvalidTypeException when call ThreadReference.forceEarlyReturn with VoidValue + * @bug 6431720 + * @summary Unexpected InvalidTypeException when call ThreadReference.forceEarlyReturn with VoidValue * - * @bug 6432855 - * @summary Need a way to create JDI VoidValue for use in ThreadReference.forceEarlyReturn + * @bug 6432855 + * @summary Need a way to create JDI VoidValue for use in ThreadReference.forceEarlyReturn * - * @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund) + * @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund) * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g EarlyReturnTest.java - * @run driver EarlyReturnTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g EarlyReturnTest.java + * @run driver EarlyReturnTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/EnumTest.java b/test/com/sun/jdi/EnumTest.java --- a/test/com/sun/jdi/EnumTest.java +++ b/test/com/sun/jdi/EnumTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4728816 - * @summary JPDA: Add support for enums + * @test + * @bug 4728816 + * @summary JPDA: Add support for enums + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g EnumTest.java - * @run driver EnumTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g EnumTest.java + * @run driver EnumTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/EvalArgs.sh b/test/com/sun/jdi/EvalArgs.sh --- a/test/com/sun/jdi/EvalArgs.sh +++ b/test/com/sun/jdi/EvalArgs.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 4663146 -# @summary Arguments match no method error -# @author Jim Holmlund/Suvasis +# @test +# @bug 4663146 +# @summary Arguments match no method error +# @author Jim Holmlund/Suvasis # -# @run shell/timeout=300 EvalArgs.sh +# @run shell/timeout=300 EvalArgs.sh # The bug is that, for example, if a String is passed # as an arg to a func where an Object is expected, @@ -72,13 +72,13 @@ System.out.println( ffjj1(myjj1)); System.out.println( ffjj1(myjj2)); - System.out.println("$classname.ffoverload($classname.jjboolean) = " + + System.out.println("$classname.ffoverload($classname.jjboolean) = " + $classname.ffoverload($classname.jjboolean)); - System.out.println("$classname.ffoverload($classname.jjbyte) = " + + System.out.println("$classname.ffoverload($classname.jjbyte) = " + $classname.ffoverload($classname.jjbyte)); - System.out.println("$classname.ffoverload($classname.jjchar) = " + + System.out.println("$classname.ffoverload($classname.jjchar) = " + $classname.ffoverload($classname.jjchar)); - System.out.println("$classname.ffoverload($classname.jjdouble) = " + + System.out.println("$classname.ffoverload($classname.jjdouble) = " + $classname.ffoverload($classname.jjdouble)); @@ -94,11 +94,11 @@ public static String ffjj1(jj1 arg) { return arg.me; } - + public static String ffjj2(jj2 arg) { return arg.me; } - + static String ffboolean(boolean p1) { return "ffbool: p1 = " + p1; } @@ -106,31 +106,31 @@ static String ffbyte(byte p1) { return "ffbyte: p1 = " + p1; } - + static String ffchar(char p1) { return "ffchar: p1 = " + p1; } - + static String ffdouble(double p1) { return "ffdouble: p1 = " + p1; } - + static String fffloat(float p1) { return "fffloat: p1 = " + p1; } - + static String ffint(int p1) { return "ffint: p1 = " + p1; } - + static String fflong(long p1) { return "fflong: p1 = " + p1; } - + static String ffshort(short p1) { return "ffshort: p1 = " + p1; } - + static String ffintArray(int[] p1) { return "ffintArray: p1 = " + p1; } @@ -139,15 +139,15 @@ public static String ffoverload(jj1 arg) { return arg.me; } - + static String ffoverload(boolean p1) { return "ffoverload: boolean p1 = " + p1; } -/*** +/*** static String ffoverload(byte p1) { return "ffoverload: byte p1 = " + p1; } -***/ +***/ static String ffoverload(char p1) { return "ffoverload: char p1 = " + p1; } @@ -159,11 +159,11 @@ static String ffoverload(float p1) { return "ffoverload: float p1 = " + p1; } -/*** +/*** static String ffoverload(int p1) { return "ffoverload: int p1 = " + p1; } -***/ +***/ static String ffoverload(long p1) { return "ffoverload: long p1 = " + p1; } @@ -171,7 +171,7 @@ static String ffoverload(short p1) { return "ffoverload: short p1 = " + p1; } - + static String ffoverload(int[] p1) { return "ffoverload: int array p1 = " + p1; } @@ -184,7 +184,7 @@ public String toString() { return me; } - + } static class jj2 extends jj1 { @@ -227,7 +227,7 @@ # Provide a visual break in the output cmd print 1 - # Verify mixing primitive types works ok + # Verify mixing primitive types works ok # These should work even though the arg types are # not the same because there is only one # method with each name. @@ -302,7 +302,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/EvalArraysAsList.sh b/test/com/sun/jdi/EvalArraysAsList.sh --- a/test/com/sun/jdi/EvalArraysAsList.sh +++ b/test/com/sun/jdi/EvalArraysAsList.sh @@ -22,14 +22,15 @@ # questions. # -# @test -# @bug 8160024 -# @summary jdb returns invalid argument count if first parameter to Arrays.asList is null +# @test +# @bug 8160024 +# @summary jdb returns invalid argument count if first parameter to Arrays.asList is null +# The test checks if evaluation of the expression java.util.Arrays.asList(null, "a") +# works normally and does not throw an IllegalArgumentException. # -# @run shell/timeout=300 EvalArraysAsList.sh +# @run shell/timeout=300 EvalArraysAsList.sh # -# The test checks if evaluation of the expression java.util.Arrays.asList(null, "a") -# works normally and does not throw an IllegalArgumentException. + classname=EvalArraysAsList diff --git a/test/com/sun/jdi/EvalInterfaceStatic.sh b/test/com/sun/jdi/EvalInterfaceStatic.sh --- a/test/com/sun/jdi/EvalInterfaceStatic.sh +++ b/test/com/sun/jdi/EvalInterfaceStatic.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 8031195 -# @summary JDB allows evaluation of calls to static interface methods -# @author Jaroslav Bachorik +# @test +# @bug 8031195 +# @summary JDB allows evaluation of calls to static interface methods +# @author Jaroslav Bachorik # -# @run shell/timeout=300 EvalInterfaceStatic.sh +# @run shell/timeout=300 EvalInterfaceStatic.sh # The test exercises the ability to invoke static methods on interfaces. # Static interface methods are a new feature added in JDK8. diff --git a/test/com/sun/jdi/EventQueueDisconnectTest.java b/test/com/sun/jdi/EventQueueDisconnectTest.java --- a/test/com/sun/jdi/EventQueueDisconnectTest.java +++ b/test/com/sun/jdi/EventQueueDisconnectTest.java @@ -22,21 +22,20 @@ */ /** - * @test - * @bug 4425852 - * @author Robert Field + * @test + * @bug 4425852 + * @author Robert Field * - * @modules jdk.jdi - * @run build VMConnection - * @run compile -g EventQueueDisconnectTest.java - * @run driver EventQueueDisconnectTest - * - * @summary EventQueueDisconnectTest checks to see that - * VMDisconnectedException is never thrown before VMDisconnectEvent. + * @summary EventQueueDisconnectTest checks to see that + * VMDisconnectedException is never thrown before VMDisconnectEvent. * * Failure mode for this test is throwing VMDisconnectedException * on vm.eventQueue().remove(); * Does not use a scaffold since we don't want that hiding the exception. + * + * @run build VMConnection + * @run compile -g EventQueueDisconnectTest.java + * @run driver EventQueueDisconnectTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/ExceptionEvents.java b/test/com/sun/jdi/ExceptionEvents.java --- a/test/com/sun/jdi/ExceptionEvents.java +++ b/test/com/sun/jdi/ExceptionEvents.java @@ -22,43 +22,41 @@ */ /** - * @test - * @bug 4407397 - * @summary Test the requesting of exception events + * @test + * @bug 4407397 + * @key intermittent + * @summary Test the requesting of exception events + * @author Robert Field * - * @author Robert Field + * @run build TestScaffold VMConnection + * @run compile -g ExceptionEvents.java * - * @key intermittent - * @modules jdk.jdi - * @run build TestScaffold VMConnection - * @run compile -g ExceptionEvents.java - * - * @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.Exception - * @run driver ExceptionEvents C A StackOverflowCaughtTarg null - * @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.Error - * @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.StackOverflowError - * @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.Exception + * @run driver ExceptionEvents C A StackOverflowCaughtTarg null + * @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.Error + * @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.StackOverflowError + * @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.Exception - * @run driver ExceptionEvents C T StackOverflowCaughtTarg null - * @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.Error - * @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.StackOverflowError - * @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.Exception + * @run driver ExceptionEvents C T StackOverflowCaughtTarg null + * @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.Error + * @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.StackOverflowError + * @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.Exception - * @run driver ExceptionEvents C N StackOverflowCaughtTarg null - * @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.Error - * @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.StackOverflowError - * @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.Exception + * @run driver ExceptionEvents C N StackOverflowCaughtTarg null + * @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.Error + * @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.StackOverflowError + * @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.Exception - * @run driver ExceptionEvents U A StackOverflowUncaughtTarg null - * @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.Error - * @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.StackOverflowError - * @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.Exception + * @run driver ExceptionEvents U A StackOverflowUncaughtTarg null + * @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.Error + * @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.StackOverflowError + * @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents N T StackOverflowUncaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents N N StackOverflowUncaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N T StackOverflowUncaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents N N StackOverflowUncaughtTarg java.lang.NullPointerException */ import com.sun.jdi.*; diff --git a/test/com/sun/jdi/ExclusiveBind.java b/test/com/sun/jdi/ExclusiveBind.java --- a/test/com/sun/jdi/ExclusiveBind.java +++ b/test/com/sun/jdi/ExclusiveBind.java @@ -25,10 +25,11 @@ * @bug 4531526 * @summary Test that more than one debuggee cannot bind to same port * at the same time. + * * @library /lib/testlibrary - * * @modules java.management * jdk.jdi + * * @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld * @run driver ExclusiveBind */ diff --git a/test/com/sun/jdi/ExpiredRequestDeletionTest.java b/test/com/sun/jdi/ExpiredRequestDeletionTest.java --- a/test/com/sun/jdi/ExpiredRequestDeletionTest.java +++ b/test/com/sun/jdi/ExpiredRequestDeletionTest.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4453310 - * @summary Test the deletion of event requests that are expired - * by virtue of addCountFilter. + * @test + * @bug 4453310 + * @summary Test the deletion of event requests that are expired + * by virtue of addCountFilter. * - * @author Robert Field + * @author Robert Field * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ExpiredRequestDeletionTest.java - * @run driver ExpiredRequestDeletionTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ExpiredRequestDeletionTest.java + * @run driver ExpiredRequestDeletionTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/FetchLocals.java b/test/com/sun/jdi/FetchLocals.java --- a/test/com/sun/jdi/FetchLocals.java +++ b/test/com/sun/jdi/FetchLocals.java @@ -1,13 +1,37 @@ -/** hard coded linenumbers in test - DO NOT CHANGE - * @test/nodynamiccopyright/ - * @bug 4386002 4429245 - * @summary Test fix for: Incorrect values reported for some locals of type long +/* + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * @author Tim Bell + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. * - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g FetchLocals.java - * @run driver FetchLocals + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// THIS TEST IS LINE NUMBER SENSITIVE + +/** + * @test + * @bug 4386002 4429245 + * @summary Test fix for: Incorrect values reported for some locals of type long + * @author Tim Bell + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g FetchLocals.java + * @run driver FetchLocals */ import com.sun.jdi.*; import com.sun.jdi.event.*; @@ -59,7 +83,7 @@ System.out.println(f); System.out.print("d is: "); System.out.println(d); - System.out.println(); // Thie is Line 63... + System.out.println(); // This is FetchLocals::LINE if (w == 0xde00ad00be00ef00L) { System.out.print ("The debugger was here. w modified to: 0x"); System.out.println(Long.toHexString(w)); @@ -87,6 +111,7 @@ } public class FetchLocals extends TestScaffold { + static final int LINE = 86; FetchLocals (String args[]) { super(args); @@ -355,7 +380,7 @@ * Get to the bottom of testMethod(): */ try { - BreakpointEvent bpe = resumeTo("FetchLocalsDebugee", 63); + BreakpointEvent bpe = resumeTo("FetchLocalsDebugee", LINE); /* * Fetch values from fields; what did we get? */ diff --git a/test/com/sun/jdi/FieldWatchpoints.java b/test/com/sun/jdi/FieldWatchpoints.java --- a/test/com/sun/jdi/FieldWatchpoints.java +++ b/test/com/sun/jdi/FieldWatchpoints.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4408582 - * @summary Test fix for: JDWP: WatchpointEvents outside of class filtered out + * @test + * @bug 4408582 + * @summary Test fix for: JDWP: WatchpointEvents outside of class filtered out + * @author Tim Bell * - * @author Tim Bell - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g FieldWatchpoints.java - * @run driver FieldWatchpoints + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g FieldWatchpoints.java + * @run driver FieldWatchpoints */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/FilterMatch.java b/test/com/sun/jdi/FilterMatch.java --- a/test/com/sun/jdi/FilterMatch.java +++ b/test/com/sun/jdi/FilterMatch.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4331522 - * @summary addClassFilter("Foo") acts like "Foo*" + * @test + * @bug 4331522 + * @summary addClassFilter("Foo") acts like "Foo*" + * @author Robert Field/Jim Holmlund * - * @author Robert Field/Jim Holmlund - * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g HelloWorld.java - * @run driver FilterMatch + * @run build JDIScaffold VMConnection + * @run compile -g HelloWorld.java + * @run driver FilterMatch */ /* Look at patternMatch in JDK file: diff --git a/test/com/sun/jdi/FilterNoMatch.java b/test/com/sun/jdi/FilterNoMatch.java --- a/test/com/sun/jdi/FilterNoMatch.java +++ b/test/com/sun/jdi/FilterNoMatch.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4331522 - * @summary addClassFilter("Foo") acts like "Foo*" + * @test + * @bug 4331522 + * @summary addClassFilter("Foo") acts like "Foo*" + * @author Robert Field/Jim Holmlund * - * @author Robert Field/Jim Holmlund - * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g HelloWorld.java - * @run driver FilterNoMatch + * @run build JDIScaffold VMConnection + * @run compile -g HelloWorld.java + * @run driver FilterNoMatch */ /* This tests the patternMatch function in JDK file: diff --git a/test/com/sun/jdi/FinalLocalsTest.java b/test/com/sun/jdi/FinalLocalsTest.java --- a/test/com/sun/jdi/FinalLocalsTest.java +++ b/test/com/sun/jdi/FinalLocalsTest.java @@ -22,18 +22,16 @@ */ /** - * @test - * @bug 4326648 4768329 - * @summary Test to verify that table entries are generated for all final - * locals when a class is built for debug, even if they could be - * inlined otherwise. + * @test + * @bug 4326648 4768329 + * @summary Test to verify that table entries are generated for all final + * locals when a class is built for debug, even if they could be + * inlined otherwise. + * @author Tim Bell * - * @author Tim Bell - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g FinalLocalsTest.java - * @run driver FinalLocalsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g FinalLocalsTest.java + * @run driver FinalLocalsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/FinalizerTest.java b/test/com/sun/jdi/FinalizerTest.java --- a/test/com/sun/jdi/FinalizerTest.java +++ b/test/com/sun/jdi/FinalizerTest.java @@ -22,16 +22,15 @@ */ /** - * @test - * @bug 4272800 4274208 4392010 - * @summary Test debugger operations in finalize() methods - * @author Gordon Hirsch (modified for HotSpot by tbell & rfield) + * @test + * @bug 4272800 4274208 4392010 + * @summary Test debugger operations in finalize() methods + * @author Gordon Hirsch (modified for HotSpot by tbell & rfield) * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g FinalizerTest.java + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g FinalizerTest.java * - * @run driver FinalizerTest + * @run driver FinalizerTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/FramesTest.java b/test/com/sun/jdi/FramesTest.java --- a/test/com/sun/jdi/FramesTest.java +++ b/test/com/sun/jdi/FramesTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4434232 - * @summary Test ThreadReference.frames(int,int) + * @test + * @bug 4434232 + * @summary Test ThreadReference.frames(int,int) + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g FramesTest.java - * @run driver FramesTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g FramesTest.java + * @run driver FramesTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/GenericsTest.java b/test/com/sun/jdi/GenericsTest.java --- a/test/com/sun/jdi/GenericsTest.java +++ b/test/com/sun/jdi/GenericsTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4421040 - * @summary JPDA: Add support for JSR-014 Generics + * @test + * @bug 4421040 + * @summary JPDA: Add support for JSR-014 Generics + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g GenericsTest.java - * @run driver GenericsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g GenericsTest.java + * @run driver GenericsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/GetLocalVariables.java b/test/com/sun/jdi/GetLocalVariables.java --- a/test/com/sun/jdi/GetLocalVariables.java +++ b/test/com/sun/jdi/GetLocalVariables.java @@ -1,14 +1,39 @@ -/** hard coded linenumbers in this test - DO NOT CHANGE - * @test/nodynamiccopyright/ - * @bug 4359312 4450091 - * @summary Test PTR 1421 JVM exceptions making a call to LocalVariable.type().name() +/* + * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * @author Tim Bell (based on the PTR 1421 report submitted by IBM). + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. * - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g GetLocalVariables.java - * @run driver GetLocalVariables + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ + +// THIS TEST IS LINE NUMBER SENSITIVE + +/** + * @test + * @bug 4359312 4450091 + * @summary Test PTR 1421 JVM exceptions making a call to LocalVariable.type().name() + * @author Tim Bell (based on the PTR 1421 report submitted by IBM). + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g GetLocalVariables.java + * @run driver GetLocalVariables + */ + import com.sun.jdi.*; import com.sun.jdi.event.*; import com.sun.jdi.request.*; @@ -194,7 +219,7 @@ l_long, l_float, l_double, l_iarray, l_marray, l_string); - e1.test_1(); // <-- this is line 197 + e1.test_1(); // RESUME_TO_LINE e3.test_1(); e4.test_1(); e5.test_1(); @@ -231,6 +256,7 @@ /********** test program **********/ public class GetLocalVariables extends TestScaffold { + static final int RESUME_TO_LINE = 222; ReferenceType targetClass; ThreadReference mainThread; @@ -257,7 +283,7 @@ mainThread = bpe.thread(); EventRequestManager erm = vm().eventRequestManager(); - bpe = resumeTo("GetLocalVariablesTarg", 197); + bpe = resumeTo("GetLocalVariablesTarg", RESUME_TO_LINE); /* * We've arrived. Look around at some variables. */ diff --git a/test/com/sun/jdi/GetLocalVariables2Test.java b/test/com/sun/jdi/GetLocalVariables2Test.java --- a/test/com/sun/jdi/GetLocalVariables2Test.java +++ b/test/com/sun/jdi/GetLocalVariables2Test.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4349534 4690242 4695338 - * @summary regression - bad LocalVariableTable attribute when no initialization needed + * @test + * @bug 4349534 4690242 4695338 + * @summary regression - bad LocalVariableTable attribute when no initialization needed + * @author Tim Bell * - * @author Tim Bell - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g GetLocalVariables2Test.java - * @run driver GetLocalVariables2Test + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g GetLocalVariables2Test.java + * @run driver GetLocalVariables2Test */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/GetLocalVariables3Test.sh b/test/com/sun/jdi/GetLocalVariables3Test.sh --- a/test/com/sun/jdi/GetLocalVariables3Test.sh +++ b/test/com/sun/jdi/GetLocalVariables3Test.sh @@ -24,12 +24,12 @@ # # -# @test -# @bug 4448658 -# @summary javac produces the inconsistent variable debug in while loops. -# @author Tim Bell +# @test +# @bug 4448658 +# @summary javac produces the inconsistent variable debug in while loops. +# @author Tim Bell # -# @run shell GetLocalVariables3Test.sh +# @run shell GetLocalVariables3Test.sh # classname=GetLocalVariables3Targ @@ -67,7 +67,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/GetLocalVariables4Test.sh b/test/com/sun/jdi/GetLocalVariables4Test.sh --- a/test/com/sun/jdi/GetLocalVariables4Test.sh +++ b/test/com/sun/jdi/GetLocalVariables4Test.sh @@ -24,12 +24,12 @@ # # -# @test -# @bug 4070747 4486859 -# @summary Compiler fails to generate local var tbl entry for exception passed to catch -# @author Tim Bell +# @test +# @bug 4070747 4486859 +# @summary Compiler fails to generate local var tbl entry for exception passed to catch +# @author Tim Bell # -# @run shell GetLocalVariables4Test.sh +# @run shell GetLocalVariables4Test.sh # classname=GetLocalVariables4Targ @@ -69,7 +69,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/GetSetLocalTest.java b/test/com/sun/jdi/GetSetLocalTest.java --- a/test/com/sun/jdi/GetSetLocalTest.java +++ b/test/com/sun/jdi/GetSetLocalTest.java @@ -1,13 +1,37 @@ -/** hard coded linenumbers in other tests - DO NOT CHANGE - * @test/nodynamiccopyright/ - * @bug 4300412 - * @summary Test GetLocal* and SetLocal* functions +/* + * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * @author Serguei Spitsyn + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. * - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g GetSetLocalTest.java - * @run driver GetSetLocalTest + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// THIS TEST IS LINE NUMBER SENSITIVE + +/** + * @test + * @bug 4300412 + * @summary Test GetLocal* and SetLocal* functions + * @author Serguei Spitsyn + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g GetSetLocalTest.java + * @run driver GetSetLocalTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; @@ -35,7 +59,7 @@ int result; { { boolean bool_1 = false; - intArg++; + intArg++; // START_LINE } boolean bool_2 = true; @@ -111,7 +135,7 @@ } Object obj_2 = new Object(); - intArg++; // <-- Last stop is at this point. + intArg++; // STOP_LINE. Last stop is at this point. // Only obj_2 and intArg are valid // Note: even result is not valid here! } @@ -125,6 +149,8 @@ /********** test program **********/ public class GetSetLocalTest extends TestScaffold { + static final int START_LINE = 62; + static final int STOP_LINE = 138; ReferenceType targetClass; ThreadReference mainThread; @@ -635,7 +661,7 @@ println("EventRequestManager"); StackFrame frame = null; - for (int line = 38; line < 118; line += 4) { + for (int line = START_LINE; line <= STOP_LINE; line += 4) { println("\n resumeTo(GetSetLocalTarg, " + line + ")"); bpe = resumeTo("GetSetLocalTarg", line); frame = bpe.thread().frame(0); diff --git a/test/com/sun/jdi/GetUninitializedStringValue.java b/test/com/sun/jdi/GetUninitializedStringValue.java --- a/test/com/sun/jdi/GetUninitializedStringValue.java +++ b/test/com/sun/jdi/GetUninitializedStringValue.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 8021897 - * @summary Test getting the value for an uninitialized String object + * @test + * @bug 8021897 + * @summary Test getting the value for an uninitialized String object + * @author Staffan Larsen * - * @author Staffan Larsen - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g GetUninitializedStringValue.java - * @run driver GetUninitializedStringValue + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g GetUninitializedStringValue.java + * @run driver GetUninitializedStringValue */ import com.sun.jdi.ReferenceType; import com.sun.jdi.StackFrame; diff --git a/test/com/sun/jdi/HomeTest.java b/test/com/sun/jdi/HomeTest.java --- a/test/com/sun/jdi/HomeTest.java +++ b/test/com/sun/jdi/HomeTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4446294 - * @summary JDI spec/impl: default "home" for CommandLineLaunch isn't java.home + * @test + * @bug 4446294 + * @summary JDI spec/impl: default "home" for CommandLineLaunch isn't java.home + * @author Tim Bell (based on "HomeTest.java" by Eugene I. Latkin) * - * @author Tim Bell (based on "HomeTest.java" by Eugene I. Latkin) - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g HomeTest.java - * @run driver HomeTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g HomeTest.java + * @run driver HomeTest */ import com.sun.jdi.*; import com.sun.jdi.connect.*; diff --git a/test/com/sun/jdi/ImmutableResourceTest.sh b/test/com/sun/jdi/ImmutableResourceTest.sh --- a/test/com/sun/jdi/ImmutableResourceTest.sh +++ b/test/com/sun/jdi/ImmutableResourceTest.sh @@ -21,13 +21,13 @@ # questions. # -# @test -# @bug 6287579 -# @summary SubClasses of ListResourceBundle should fix getContents() -# @author Tim Bell # -# @run shell ImmutableResourceTest.sh +# @test +# @bug 6287579 +# @summary SubClasses of ListResourceBundle should fix getContents() +# @author Tim Bell # +# @run shell ImmutableResourceTest.sh # # Beginning of subroutines: diff --git a/test/com/sun/jdi/InstanceFilter.java b/test/com/sun/jdi/InstanceFilter.java --- a/test/com/sun/jdi/InstanceFilter.java +++ b/test/com/sun/jdi/InstanceFilter.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4312961 - * @summary Verify that an instance filter on a MethodEntryRequest works - * properly. + * @test + * @bug 4312961 + * @summary Verify that an instance filter on a MethodEntryRequest works + * properly. + * @author Robert Field/Jim Holmlund * - * @author Robert Field/Jim Holmlund - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetAdapter TargetListener - * @run compile -g InstanceFilter.java - * @run driver InstanceFilter + * @run build TestScaffold VMConnection TargetAdapter TargetListener + * @run compile -g InstanceFilter.java + * @run driver InstanceFilter */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/InstancesTest.java b/test/com/sun/jdi/InstancesTest.java --- a/test/com/sun/jdi/InstancesTest.java +++ b/test/com/sun/jdi/InstancesTest.java @@ -22,15 +22,14 @@ */ /** - * @test - * @bug 5024119 - * @summary Add ReferenceType.getAllInstances () method to JDI. - * @author jjh + * @test + * @bug 5024119 + * @summary Add ReferenceType.getAllInstances () method to JDI. + * @author jjh * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InstancesTest.java - * @run driver InstancesTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InstancesTest.java + * @run driver InstancesTest */ /* diff --git a/test/com/sun/jdi/InterfaceMethodsTest.java b/test/com/sun/jdi/InterfaceMethodsTest.java --- a/test/com/sun/jdi/InterfaceMethodsTest.java +++ b/test/com/sun/jdi/InterfaceMethodsTest.java @@ -22,16 +22,15 @@ */ /** - * @test - * @bug 8031195 - * @bug 8071657 - * @bug 8165827 - * @summary JDI: Add support for static, private and default methods in interfaces + * @test + * @bug 8031195 + * @bug 8071657 + * @bug 8165827 + * @summary JDI: Add support for static, private and default methods in interfaces * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run build InterfaceMethodsTest - * @run driver InterfaceMethodsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run build InterfaceMethodsTest + * @run driver InterfaceMethodsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/InterruptHangTest.java b/test/com/sun/jdi/InterruptHangTest.java --- a/test/com/sun/jdi/InterruptHangTest.java +++ b/test/com/sun/jdi/InterruptHangTest.java @@ -26,16 +26,14 @@ import com.sun.jdi.request.*; /** - * @test - * @bug 6459476 - * @summary Debuggee is blocked, looks like running + * @test + * @bug 6459476 + * @summary Debuggee is blocked, looks like running + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InterruptHangTest.java - * @run driver InterruptHangTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InterruptHangTest.java + * @run driver InterruptHangTest */ /** diff --git a/test/com/sun/jdi/InvokeHangTest.java b/test/com/sun/jdi/InvokeHangTest.java --- a/test/com/sun/jdi/InvokeHangTest.java +++ b/test/com/sun/jdi/InvokeHangTest.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 6293795 - * @summary Backend hangs when invokeMethod is called from a JDI eventHandler + * @test + * @bug 6293795 + * @summary Backend hangs when invokeMethod is called from a JDI eventHandler + * @author jjh * - * @author jjh + * @library /test/lib * - * @modules jdk.jdi - * @library /test/lib - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InvokeHangTest.java - * @run driver InvokeHangTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InvokeHangTest.java + * @run driver InvokeHangTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/InvokeTest.java b/test/com/sun/jdi/InvokeTest.java --- a/test/com/sun/jdi/InvokeTest.java +++ b/test/com/sun/jdi/InvokeTest.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4451941 4527072 - * @summary Test argument types for invoke + * @test + * @bug 4451941 4527072 + * @summary Test argument types for invoke + * @author Robert Field * - * @author Robert Field + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InvokeTest.java - * @run driver InvokeTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InvokeTest.java + * @run driver InvokeTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/InvokeVarArgs.java b/test/com/sun/jdi/InvokeVarArgs.java --- a/test/com/sun/jdi/InvokeVarArgs.java +++ b/test/com/sun/jdi/InvokeVarArgs.java @@ -22,12 +22,13 @@ */ /** - * @test - * @bug 8075331 - * @summary Verify that we can call varargs methods - * @run build TestScaffold VMConnection TargetAdapter TargetListener - * @run compile -g InvokeVarArgs.java - * @run driver InvokeVarArgs + * @test + * @bug 8075331 + * @summary Verify that we can call varargs methods + * + * @run build TestScaffold VMConnection TargetAdapter TargetListener + * @run compile -g InvokeVarArgs.java + * @run driver InvokeVarArgs */ import com.sun.jdi.*; diff --git a/test/com/sun/jdi/JITDebug.sh b/test/com/sun/jdi/JITDebug.sh --- a/test/com/sun/jdi/JITDebug.sh +++ b/test/com/sun/jdi/JITDebug.sh @@ -24,17 +24,16 @@ # # -# @test JITDebug.sh 1.7 03/09/05 -# @bug 4291701 4376819 4422312 4522770 4913748 -# @summary Test JIT debugging - assure that launching on -# uncaught exception works -# @author Tim Bell -# Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh +# @test JITDebug.sh 1.7 03/09/05 +# @bug 4291701 4376819 4422312 4522770 4913748 +# @summary Test JIT debugging - assure that launching on +# uncaught exception works +# @author Tim Bell +# Based on test/java/awt/TEMPLATE/AutomaticShellTest.sh # -# @modules jdk.jdi -# @run build TestScaffold VMConnection TargetListener TargetAdapter -# @run compile -g JITDebug.java -# @run shell JITDebug.sh +# @run build TestScaffold VMConnection TargetListener TargetAdapter +# @run compile -g JITDebug.java +# @run shell JITDebug.sh # Beginning of subroutines: status=1 diff --git a/test/com/sun/jdi/Java_gTest.java b/test/com/sun/jdi/Java_gTest.java --- a/test/com/sun/jdi/Java_gTest.java +++ b/test/com/sun/jdi/Java_gTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4500906 4433599 4740097 - * @summary vmexec= debug java fails for SunCommandLineLauncher + * @test + * @bug 4500906 4433599 4740097 + * @summary vmexec= debug java fails for SunCommandLineLauncher + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g Java_gTest.java - * @run driver Java_gTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g Java_gTest.java + * @run driver Java_gTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/JdbArgTest.sh b/test/com/sun/jdi/JdbArgTest.sh --- a/test/com/sun/jdi/JdbArgTest.sh +++ b/test/com/sun/jdi/JdbArgTest.sh @@ -23,15 +23,16 @@ # questions. # -# @test -# @bug 4684386 -# @summary TTY: jdb throws IllegalArumentException on cmd line args -# @author Jim/suvasis -# @run shell JdbArgTest.sh +# @test +# @bug 4684386 +# @summary TTY: jdb throws IllegalArumentException on cmd line args +# @author Jim/suvasis +# +# @run shell JdbArgTest.sh #Call this from anywhere to fail the test with an error message # usage: fail "reason why the test failed" -fail() +fail() { echo "The test failed :-(" echo "$*" 1>&2 echo "exit status was $status" @@ -40,7 +41,7 @@ #Call this from anywhere to pass the test with a message # usage: pass "reason why the test passed if applicable" -pass() +pass() { echo "The test passed!!!" echo "$*" 1>&2 exit 0 @@ -48,7 +49,7 @@ # end of subroutines -#Set appropriate jdk +#Set appropriate jdk if [ ! -z "${TESTJAVA}" ] ; then jdk="$TESTJAVA" diff --git a/test/com/sun/jdi/JdbExprTest.sh b/test/com/sun/jdi/JdbExprTest.sh --- a/test/com/sun/jdi/JdbExprTest.sh +++ b/test/com/sun/jdi/JdbExprTest.sh @@ -23,11 +23,12 @@ # questions. # -# @test -# @bug 4660158 -# @author Staffan Larsen -# @key intermittent -# @run shell JdbExprTest.sh +# @test +# @bug 4660158 +# @key intermittent +# @author Staffan Larsen +# +# @run shell JdbExprTest.sh # These are variables that can be set to control execution @@ -53,7 +54,7 @@ public static void bkpt() { int i = 0; //@1 breakpoint } - + public static void main(String[] args) { bkpt(); } @@ -73,7 +74,7 @@ cmd print java.lang.Long.MIN_VALUE jdbFailIfNotPresent " \= \-9223372036854775808" 3 - + cmd print 9223372036854775807L jdbFailIfNotPresent "9223372036854775807L = 9223372036854775807" 3 cmd print 9223372036854775807 @@ -83,7 +84,7 @@ jdbFailIfNotPresent "\-9223372036854775807L = \-9223372036854775807" 3 cmd print -9223372036854775807 jdbFailIfNotPresent "\-9223372036854775807 = \-9223372036854775807" 3 - + cmd print -1 jdbFailIfNotPresent "\-1 = \-1" 3 cmd print 1L @@ -92,7 +93,7 @@ jdbFailIfNotPresent "\-1L = \-1" 3 cmd print 0x1 jdbFailIfNotPresent "0x1 = 1" 3 - + cmd set $classname.aLong = 9223372036854775807L cmd print $classname.aLong jdbFailIfNotPresent "$classname.aLong = 9223372036854775807" 3 @@ -142,7 +143,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/JdbLockTest.sh b/test/com/sun/jdi/JdbLockTest.sh --- a/test/com/sun/jdi/JdbLockTest.sh +++ b/test/com/sun/jdi/JdbLockTest.sh @@ -23,11 +23,12 @@ # questions. # -# @test -# @bug 4847812 -# @summary TTY: jdb lock command displays incorrect data -# @author Jim Holmlund -# @run shell JdbLockTest.sh +# @test +# @bug 4847812 +# @summary TTY: jdb lock command displays incorrect data +# @author Jim Holmlund +# +# @run shell JdbLockTest.sh # These are variables that can be set to control execution @@ -94,7 +95,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/JdbMethodExitTest.sh b/test/com/sun/jdi/JdbMethodExitTest.sh --- a/test/com/sun/jdi/JdbMethodExitTest.sh +++ b/test/com/sun/jdi/JdbMethodExitTest.sh @@ -23,11 +23,12 @@ # questions. # -# @test -# @bug 6202891 -# @summary TTY: Add support for method exit event return values to jdb -# @author Jim Holmlund -# @run shell JdbMethodExitTest.sh +# @test +# @bug 6202891 +# @summary TTY: Add support for method exit event return values to jdb +# @author Jim Holmlund +# +# @run shell JdbMethodExitTest.sh # These are variables that can be set to control execution @@ -74,7 +75,7 @@ public static String stringValue = "abc"; public static int[] intArrayValue = new int[] {1, 2, 3}; - public static $classname objectValue = + public static $classname objectValue = new $classname(); public String ivar = stringValue; @@ -91,7 +92,7 @@ public ClassLoader i_classLoaderf() { return classLoaderValue; } public Thread i_threadf() { return threadValue = Thread.currentThread(); } - public ThreadGroup i_threadGroupf() + public ThreadGroup i_threadGroupf() { return threadGroupValue = threadValue.getThreadGroup(); } public int[] i_intArrayf() { return intArrayValue; } public Object i_nullObjectf() { return null; } @@ -162,7 +163,7 @@ // test all possible return types doit(xx); bkpt(); - + // test trace methods traceMethods(); @@ -176,14 +177,14 @@ // test trace method exits traceExits1(); bkpt(); - + // test trace method exit traceExit(); // test trace method exit traceExit1(); bkpt(); - + } } EOF @@ -293,7 +294,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/JdbMissStep.sh b/test/com/sun/jdi/JdbMissStep.sh --- a/test/com/sun/jdi/JdbMissStep.sh +++ b/test/com/sun/jdi/JdbMissStep.sh @@ -23,13 +23,13 @@ # questions. # -# @test -# @bug 4762765 -# @summary REGRESSION: jdb / jdi not stopping at some breakpoints and steps in j2sdk1.4. -# @author Jim Holmlund +# @test +# @bug 4762765 +# @key intermittent +# @summary REGRESSION: jdb / jdi not stopping at some breakpoints and steps in j2sdk1.4. +# @author Jim Holmlund # -# @key intermittent -# @run shell JdbMissStep.sh +# @run shell JdbMissStep.sh # These are variables that can be set to control execution @@ -42,7 +42,7 @@ { cat < $classname.java.1 public class $classname { - + public static void main(String args[]) { $classname dbb = new $classname(); System.out.println("ANSWER IS: " + dbb.getIntVal()); @@ -86,7 +86,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/JdbReadTwiceTest.sh b/test/com/sun/jdi/JdbReadTwiceTest.sh --- a/test/com/sun/jdi/JdbReadTwiceTest.sh +++ b/test/com/sun/jdi/JdbReadTwiceTest.sh @@ -3,34 +3,35 @@ # # Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. -# +# # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # version 2 for more details (a copy is included in the LICENSE file that # accompanied this code). -# +# # You should have received a copy of the GNU General Public License version # 2 along with this work; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# +# # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. # -# -# @test -# @bug 4981536 -# @summary TTY: .jdbrc is read twice if jdb is run in the user's home dir -# @author jjh -# @run shell JdbReadTwiceTest.sh +# +# @test +# @bug 4981536 +# @summary TTY: .jdbrc is read twice if jdb is run in the user's home dir +# @author jjh +# +# @run shell JdbReadTwiceTest.sh -#Set appropriate jdk +#Set appropriate jdk if [ ! -z "$TESTJAVA" ] ; then jdk="$TESTJAVA" else @@ -97,7 +98,7 @@ failed=1 else echo "Passed: Expected $count, got $xx: $*" - fi + fi } clean() @@ -156,7 +157,7 @@ echo "If jdb.ini and both .jdbrc exist, don't read .jdbrc" mkFiles $HOME/jdb.ini $HOME/.jdbrc doit - failIfNot 1 "from $HOME/jdb.ini" + failIfNot 1 "from $HOME/jdb.ini" failIfNot 0 "from $HOME/.jdbrc" clean @@ -166,7 +167,7 @@ echo "If files exist in both ~ and ., read both" mkFiles $HOME/jdb.ini $here/.jdbrc doit - failIfNot 1 "from $HOME/jdb.ini" + failIfNot 1 "from $HOME/jdb.ini" failIfNot 1 "from $here/.jdbrc" clean @@ -213,7 +214,7 @@ doit failIfNot 1 "open: $HOME/jdb.ini" rmdir $HOME/jdb.ini - + echo "read $fred" > $here/jdb.ini echo diff --git a/test/com/sun/jdi/JdbVarargsTest.sh b/test/com/sun/jdi/JdbVarargsTest.sh --- a/test/com/sun/jdi/JdbVarargsTest.sh +++ b/test/com/sun/jdi/JdbVarargsTest.sh @@ -23,21 +23,20 @@ # questions. # -# @test -# @bug 4870984 -# @summary JPDA: Add support for RFE 4856541 - varargs +# @test +# @bug 4870984 +# @key intermittent +# @summary JPDA: Add support for RFE 4856541 - varargs +# @author jjh # -# @author jjh -# -# @key intermittent -# @run shell JdbVarargsTest.sh +# @run shell JdbVarargsTest.sh classname=JdbVarargsTest createJavaFile() { cat < $classname.java.1 public class $classname { - + public static void main(String args[]) { int ii = 0; // @1 breakpoint @@ -78,7 +77,7 @@ # check that we can call with var args cmd eval "$classname.varString(\"aa\", \"bb\");" - + # check that we can stop in ... cmd stop in "$classname.varString(java.lang.String...)" contToBkpt @@ -93,7 +92,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/LambdaBreakpointTest.java b/test/com/sun/jdi/LambdaBreakpointTest.java --- a/test/com/sun/jdi/LambdaBreakpointTest.java +++ b/test/com/sun/jdi/LambdaBreakpointTest.java @@ -21,19 +21,18 @@ * questions. */ -/********** LINE NUMBER SENSITIVE! *****************************************************************/ +// THIS TEST IS LINE NUMBER SENSITIVE /** - * @test - * @summary Test setting breakpoints on lambda calls + * @test + * @summary Test setting breakpoints on lambda calls + * @author Staffan Larsen * - * @author Staffan Larsen - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g LambdaBreakpointTest.java - * @run driver LambdaBreakpointTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g LambdaBreakpointTest.java + * @run driver LambdaBreakpointTest */ + import java.util.List; import com.sun.jdi.LocalVariable; @@ -52,7 +51,7 @@ class LambdaBreakpointTestTarg { static int[] breakpointLines = { - 63, 67, 64, 65, 66, 68 + 62, 66, 63, 64, 65, 67 }; public static void main(String[] args) { diff --git a/test/com/sun/jdi/LambdaStepTest.java b/test/com/sun/jdi/LambdaStepTest.java --- a/test/com/sun/jdi/LambdaStepTest.java +++ b/test/com/sun/jdi/LambdaStepTest.java @@ -22,15 +22,13 @@ */ /** - * @test - * @summary Test stepping through lambdas + * @test + * @summary Test stepping through lambdas + * @author Staffan Larsen * - * @author Staffan Larsen - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g LambdaStepTest.java - * @run driver LambdaStepTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g LambdaStepTest.java + * @run driver LambdaStepTest */ import com.sun.jdi.LocalVariable; import com.sun.jdi.ObjectReference; diff --git a/test/com/sun/jdi/LaunchCommandLine.java b/test/com/sun/jdi/LaunchCommandLine.java --- a/test/com/sun/jdi/LaunchCommandLine.java +++ b/test/com/sun/jdi/LaunchCommandLine.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4245011 - * @summary Test launcher command line construction - * @author Gordon Hirsch + * @test + * @bug 4245011 + * @summary Test launcher command line construction + * @author Gordon Hirsch * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g HelloWorld.java - * @run build LaunchCommandLine + * @run build JDIScaffold VMConnection + * @run compile -g HelloWorld.java + * @run build LaunchCommandLine * - * @run driver LaunchCommandLine + * @run driver LaunchCommandLine */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/LineNumberInfo.java b/test/com/sun/jdi/LineNumberInfo.java --- a/test/com/sun/jdi/LineNumberInfo.java +++ b/test/com/sun/jdi/LineNumberInfo.java @@ -27,7 +27,6 @@ * @summary Test javac regressions in the generation of line number info * @author Gordon Hirsch * - * @modules jdk.jdi * @run build TestScaffold VMConnection TargetListener TargetAdapter * @run compile -XDstringConcat=inline -g LineNumberInfo.java ControlFlow.java * diff --git a/test/com/sun/jdi/LineNumberOnBraceTest.java b/test/com/sun/jdi/LineNumberOnBraceTest.java --- a/test/com/sun/jdi/LineNumberOnBraceTest.java +++ b/test/com/sun/jdi/LineNumberOnBraceTest.java @@ -1,8 +1,32 @@ +/* + * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +// THIS TEST IS LINE NUMBER SENSITIVE + /** - * @test/nodynamiccopyright/ + * @test * @bug 4952629 4870514 * @summary REGRESSION: javac generates a spurious line number entry on } else { - * * @author jjh * * @run build VMConnection TargetListener TargetAdapter @@ -15,12 +39,10 @@ import java.util.*; - /********** LINE NUMBER SENSITIVE! *****************************************************************/ class LineNumberOnBraceTarg { - public final static int stopLine = 29; // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE - public final static int stopLine2 = 35; // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE - + public final static int stopLine = 50; // THIS MUST BE THE LINE NUMBER OF THE // stopline LINE + public final static int stopLine2 = 56; // THIS MUST BE THE LINE NUMBER OF THE // stopline2 LINE public static void main(String[] args){ System.out.println("Howdy!"); diff --git a/test/com/sun/jdi/ListenAddress.java b/test/com/sun/jdi/ListenAddress.java --- a/test/com/sun/jdi/ListenAddress.java +++ b/test/com/sun/jdi/ListenAddress.java @@ -26,7 +26,6 @@ * @summary Test that startListening(Map) method of the com.sun.jdi.SocketListen * Connector returns an address that is usable for the address option on * remove debuggees. - * @modules jdk.jdi */ import java.net.InetAddress; import java.net.Inet4Address; diff --git a/test/com/sun/jdi/LocalVariableEqual.java b/test/com/sun/jdi/LocalVariableEqual.java --- a/test/com/sun/jdi/LocalVariableEqual.java +++ b/test/com/sun/jdi/LocalVariableEqual.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4916263 - * @summary Test + * @test + * @bug 4916263 + * @summary Test + * @author Serguei Spitsyn * - * @author Serguei Spitsyn - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g LocalVariableEqual.java - * @run driver LocalVariableEqual + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g LocalVariableEqual.java + * @run driver LocalVariableEqual */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/LocationTest.java b/test/com/sun/jdi/LocationTest.java --- a/test/com/sun/jdi/LocationTest.java +++ b/test/com/sun/jdi/LocationTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4419453 - * @summary Test that Method.location() returns the right values + * @test + * @bug 4419453 + * @summary Test that Method.location() returns the right values + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g LocationTest.java - * @run driver LocationTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g LocationTest.java + * @run driver LocationTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MethodEntryExitEvents.java b/test/com/sun/jdi/MethodEntryExitEvents.java --- a/test/com/sun/jdi/MethodEntryExitEvents.java +++ b/test/com/sun/jdi/MethodEntryExitEvents.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4409241 4432820 - * @summary Test the bug fix for: MethodExitEvents disappear when Object-Methods are called from main - * @author Tim Bell + * @test + * @bug 4409241 4432820 + * @summary Test the bug fix for: MethodExitEvents disappear when Object-Methods are called from main + * @author Tim Bell * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g MethodEntryExitEvents.java - * @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee - * @run driver MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee - * @run driver MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MethodEntryExitEvents.java + * @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee + * @run driver MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee + * @run driver MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MethodExitReturnValuesTest.java b/test/com/sun/jdi/MethodExitReturnValuesTest.java --- a/test/com/sun/jdi/MethodExitReturnValuesTest.java +++ b/test/com/sun/jdi/MethodExitReturnValuesTest.java @@ -22,15 +22,14 @@ */ /** - * @test - * @bug 4195445 6204179 - * @summary JDWP, JDI: Add return value to Method Exit Event - * @author Jim Holmlund + * @test + * @bug 4195445 6204179 + * @summary JDWP, JDI: Add return value to Method Exit Event + * @author Jim Holmlund * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g MethodExitReturnValuesTest.java - * @run driver MethodExitReturnValuesTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MethodExitReturnValuesTest.java + * @run driver MethodExitReturnValuesTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MixedSuspendTest.sh b/test/com/sun/jdi/MixedSuspendTest.sh --- a/test/com/sun/jdi/MixedSuspendTest.sh +++ b/test/com/sun/jdi/MixedSuspendTest.sh @@ -23,16 +23,14 @@ # questions. # -# @test -# @bug 6224859 -# @summary JDWP: Mixing application suspends and debugger suspends can cause hangs -# -# @author Jim Holmlund -# -# @key intermittent -# @modules jdk.jdi -# @run build TestScaffold VMConnection TargetListener TargetAdapter -# @run shell MixedSuspendTest.sh +# @test +# @bug 6224859 +# @key intermittent +# @summary JDWP: Mixing application suspends and debugger suspends can cause hangs +# @author Jim Holmlund +# +# @run build TestScaffold VMConnection TargetListener TargetAdapter +# @run shell MixedSuspendTest.sh classname=MixedSuspendTarg @@ -84,7 +82,7 @@ int i = 0; } } - + System.out.println("Debuggee: end of thread"); } @@ -113,7 +111,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/ModificationWatchpoints.java b/test/com/sun/jdi/ModificationWatchpoints.java --- a/test/com/sun/jdi/ModificationWatchpoints.java +++ b/test/com/sun/jdi/ModificationWatchpoints.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4409582 - * @summary Test all info returned by modification watchpoints + * @test + * @bug 4409582 + * @summary Test all info returned by modification watchpoints + * @author Daniel Prusa (or someone in the FFJ group) + * @author Robert Field (modified to JDIScaffold) * - * @author Daniel Prusa (or someone in the FFJ group) - * @author Robert Field (modified to JDIScaffold) - * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g ModificationWatchpoints.java - * @run driver ModificationWatchpoints + * @run build JDIScaffold VMConnection + * @run compile -g ModificationWatchpoints.java + * @run driver ModificationWatchpoints */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/ModulesTest.java b/test/com/sun/jdi/ModulesTest.java --- a/test/com/sun/jdi/ModulesTest.java +++ b/test/com/sun/jdi/ModulesTest.java @@ -22,14 +22,13 @@ */ /** - * @test - * @bug 8049365 - * @summary Tests the JDI and JDWP update for modules + * @test + * @bug 8049365 + * @summary Tests the JDI and JDWP update for modules * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ModulesTest.java - * @run driver ModulesTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ModulesTest.java + * @run driver ModulesTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MonitorEventTest.java b/test/com/sun/jdi/MonitorEventTest.java --- a/test/com/sun/jdi/MonitorEventTest.java +++ b/test/com/sun/jdi/MonitorEventTest.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4401399 - * @summary Simple basic test of jdi Monitor request and event. + * @test + * @bug 4401399 + * @summary Simple basic test of jdi Monitor request and event. + * @author Swamy Venkataramanappa * - * @author Swamy Venkataramanappa - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g MonitorEventTest.java - * @run driver MonitorEventTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MonitorEventTest.java + * @run driver MonitorEventTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MonitorFrameInfo.java b/test/com/sun/jdi/MonitorFrameInfo.java --- a/test/com/sun/jdi/MonitorFrameInfo.java +++ b/test/com/sun/jdi/MonitorFrameInfo.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 6230699 - * @summary Test ThreadReference.ownedMonitorsAndFrames() - * @bug 6701700 - * @summary MonitorInfo objects aren't invalidated when the owning thread is resumed - * @author Swamy Venkataramanappa + * @test + * @bug 6230699 + * @summary Test ThreadReference.ownedMonitorsAndFrames() + * @bug 6701700 + * @summary MonitorInfo objects aren't invalidated when the owning thread is resumed + * @author Swamy Venkataramanappa * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g MonitorFrameInfo.java - * @run driver MonitorFrameInfo + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MonitorFrameInfo.java + * @run driver MonitorFrameInfo */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/MultiBreakpointsTest.java b/test/com/sun/jdi/MultiBreakpointsTest.java --- a/test/com/sun/jdi/MultiBreakpointsTest.java +++ b/test/com/sun/jdi/MultiBreakpointsTest.java @@ -23,16 +23,14 @@ /** - * @test - * @bug 4359247 - * @summary Breakpoints on multiple threads have problems. + * @test + * @bug 4359247 + * @summary Breakpoints on multiple threads have problems. + * @author tbell, jjh * - * @author tbell, jjh - * - * @modules jdk.jdi - * @build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g MultiBreakpointsTest.java - * @run driver MultiBreakpointsTest + * @build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g MultiBreakpointsTest.java + * @run driver MultiBreakpointsTest */ /* diff --git a/test/com/sun/jdi/NativeInstanceFilter.java b/test/com/sun/jdi/NativeInstanceFilter.java --- a/test/com/sun/jdi/NativeInstanceFilter.java +++ b/test/com/sun/jdi/NativeInstanceFilter.java @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 6426034 - * @summary Instance filter doesn't filter event if it occurs in native method + * @test + * @bug 6426034 + * @summary Instance filter doesn't filter event if it occurs in native method + * @author Keith McGuigan * - * @author Keith McGuigan - * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @compile -XDignore.symbol.file NativeInstanceFilterTarg.java - * @run driver NativeInstanceFilter + * @run build JDIScaffold VMConnection + * @compile -XDignore.symbol.file NativeInstanceFilterTarg.java + * @run driver NativeInstanceFilter */ /* diff --git a/test/com/sun/jdi/NewInstanceTest.java b/test/com/sun/jdi/NewInstanceTest.java --- a/test/com/sun/jdi/NewInstanceTest.java +++ b/test/com/sun/jdi/NewInstanceTest.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4419450 - * @summary Test newInstance() for arrays - currently covers - * only reference type arrays (see bug #4450091). + * @test + * @bug 4419450 + * @summary Test newInstance() for arrays - currently covers + * only reference type arrays (see bug #4450091). + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g NewInstanceTest.java - * @run driver NewInstanceTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g NewInstanceTest.java + * @run driver NewInstanceTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/NoLaunchOptionTest.java b/test/com/sun/jdi/NoLaunchOptionTest.java --- a/test/com/sun/jdi/NoLaunchOptionTest.java +++ b/test/com/sun/jdi/NoLaunchOptionTest.java @@ -30,8 +30,9 @@ * @bug 4554734 4724714 * @summary Test for -Xrunjdwp:[onthrow,onuncaught] suboptions require launch suboption * @author Tim Bell + * * @library /lib/testlibrary - * @modules jdk.jdi + * * @run compile -g NoLaunchOptionTest.java * @build jdk.testlibrary.* VMConnection * @run driver NoLaunchOptionTest diff --git a/test/com/sun/jdi/NoLocInfoTest.java b/test/com/sun/jdi/NoLocInfoTest.java --- a/test/com/sun/jdi/NoLocInfoTest.java +++ b/test/com/sun/jdi/NoLocInfoTest.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4642611 - * @summary Test that method.allLineLocations() should - * throw AbsentInformationException exception + * @test + * @bug 4642611 + * @summary Test that method.allLineLocations() should + * throw AbsentInformationException exception + * @author Serguei Spitsyn * - * @author Serguei Spitsyn - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g:none NoLocInfoTest.java - * @run driver NoLocInfoTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g:none NoLocInfoTest.java + * @run driver NoLocInfoTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/NotAField.sh b/test/com/sun/jdi/NotAField.sh --- a/test/com/sun/jdi/NotAField.sh +++ b/test/com/sun/jdi/NotAField.sh @@ -24,13 +24,14 @@ # # -# @test -# @bug 4467887 4913748 -# @summary TTY: NullPointerException at -# com.sun.tools.jdi.MirrorImpl.validateMirrors -# @author Tim Bell -# @key intermittent -# @run shell NotAField.sh +# @test +# @bug 4467887 4913748 +# @key intermittent +# @summary TTY: NullPointerException at +# com.sun.tools.jdi.MirrorImpl.validateMirrors +# @author Tim Bell +# +# @run shell NotAField.sh # createJavaFile() @@ -83,7 +84,7 @@ fi if [ -r $TESTSRC/ShellScaffold.sh ] ; then - . $TESTSRC/ShellScaffold.sh + . $TESTSRC/ShellScaffold.sh elif [ -r $TESTSRC/../ShellScaffold.sh ] ; then . $TESTSRC/../ShellScaffold.sh fi diff --git a/test/com/sun/jdi/NullLocalVariable.sh b/test/com/sun/jdi/NullLocalVariable.sh --- a/test/com/sun/jdi/NullLocalVariable.sh +++ b/test/com/sun/jdi/NullLocalVariable.sh @@ -24,12 +24,12 @@ # # -# @test -# @bug 4690242 4695338 -# @summary TTY: jdb throws NullPointerException when printing local variables -# @author Tim Bell +# @test +# @bug 4690242 4695338 +# @summary TTY: jdb throws NullPointerException when printing local variables +# @author Tim Bell # -# @run shell NullLocalVariable.sh +# @run shell NullLocalVariable.sh # classname=badscope @@ -40,10 +40,10 @@ public static final void main(String args[]) { try { System.out.println("hi!"); // @1 breakpoint - } catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } finally { - System.out.println("done"); + System.out.println("done"); } } } @@ -71,7 +71,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/NullThreadGroupNameTest.java b/test/com/sun/jdi/NullThreadGroupNameTest.java --- a/test/com/sun/jdi/NullThreadGroupNameTest.java +++ b/test/com/sun/jdi/NullThreadGroupNameTest.java @@ -22,13 +22,12 @@ */ /** - * @test - * @bug 7105883 - * @summary Ensure that JDWP doesn't crash with a null thread group name + * @test + * @bug 7105883 + * @summary Ensure that JDWP doesn't crash with a null thread group name * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run driver NullThreadGroupNameTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run driver NullThreadGroupNameTest */ import com.sun.jdi.*; import com.sun.jdi.connect.*; diff --git a/test/com/sun/jdi/OnThrowTest.java b/test/com/sun/jdi/OnThrowTest.java --- a/test/com/sun/jdi/OnThrowTest.java +++ b/test/com/sun/jdi/OnThrowTest.java @@ -22,16 +22,15 @@ */ /* - * @test OnThrowTest.java - * @bug 6263814 - * @summary Test for -agentlib::[onthrow,launch] - * @author Kelly O'Hair + * @test OnThrowTest.java + * @bug 6263814 + * @summary Test for -agentlib::[onthrow,launch] + * @author Kelly O'Hair * - * @modules jdk.jdi - * @run compile -g OnThrowTest.java - * @run compile -g OnThrowTarget.java - * @run compile -g VMConnection.java - * @run driver OnThrowTest + * @run compile -g OnThrowTest.java + * @run compile -g OnThrowTarget.java + * @run compile -g VMConnection.java + * @run driver OnThrowTest */ import java.io.File; diff --git a/test/com/sun/jdi/OomDebugTest.java b/test/com/sun/jdi/OomDebugTest.java --- a/test/com/sun/jdi/OomDebugTest.java +++ b/test/com/sun/jdi/OomDebugTest.java @@ -23,20 +23,20 @@ */ /** - * @test - * @bug 8153711 - * @summary JDWP: Memory Leak (global references not deleted after invokeMethod). + * @test + * @bug 8153711 + * @summary JDWP: Memory Leak (global references not deleted after invokeMethod). + * @author Severin Gehwolf * - * @author Severin Gehwolf + * @library .. * - * @library .. - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g OomDebugTest.java - * @run main OomDebugTest OomDebugTestTarget test1 - * @run main OomDebugTest OomDebugTestTarget test2 - * @run main OomDebugTest OomDebugTestTarget test3 - * @run main OomDebugTest OomDebugTestTarget test4 - * @run main OomDebugTest OomDebugTestTarget test5 + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g OomDebugTest.java + * @run main OomDebugTest OomDebugTestTarget test1 + * @run main OomDebugTest OomDebugTestTarget test2 + * @run main OomDebugTest OomDebugTestTarget test3 + * @run main OomDebugTest OomDebugTestTarget test4 + * @run main OomDebugTest OomDebugTestTarget test5 */ import java.io.File; import java.io.FileInputStream; diff --git a/test/com/sun/jdi/OptionTest.java b/test/com/sun/jdi/OptionTest.java --- a/test/com/sun/jdi/OptionTest.java +++ b/test/com/sun/jdi/OptionTest.java @@ -22,16 +22,15 @@ */ /* - * @test OptionTest - * @bug 5095072 - * @summary Test for misc jdwp options, just that the option is parsed - * @author Kelly O'Hair (copied from Tim Bell's NoLaunchOptionTest) + * @test OptionTest + * @bug 5095072 + * @summary Test for misc jdwp options, just that the option is parsed + * @author Kelly O'Hair (copied from Tim Bell's NoLaunchOptionTest) * - * @modules jdk.jdi - * @run compile -g OptionTest.java - * @run compile -g HelloWorld.java - * @run compile -g VMConnection.java - * @run driver OptionTest + * @run compile -g OptionTest.java + * @run compile -g HelloWorld.java + * @run compile -g VMConnection.java + * @run driver OptionTest */ import java.net.ServerSocket; diff --git a/test/com/sun/jdi/PopAndInvokeTest.java b/test/com/sun/jdi/PopAndInvokeTest.java --- a/test/com/sun/jdi/PopAndInvokeTest.java +++ b/test/com/sun/jdi/PopAndInvokeTest.java @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 6517249 - * @modules jdk.jdi - * @ignore 6951287 - * @summary JDWP: Cannot do an invokeMethod after a popFrames operation + * @test + * @bug 6517249 + * @summary JDWP: Cannot do an invokeMethod after a popFrames operation + * @author jjh * - * @author jjh + * @ignore 6951287 * - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g PopAndInvokeTest.java - * @run driver PopAndInvokeTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g PopAndInvokeTest.java + * @run driver PopAndInvokeTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/PopAndStepTest.java b/test/com/sun/jdi/PopAndStepTest.java --- a/test/com/sun/jdi/PopAndStepTest.java +++ b/test/com/sun/jdi/PopAndStepTest.java @@ -1,17 +1,39 @@ -/* /nodynamiccopyright/ */ // DO NOT DELETE ANY LINES!!!! +/* + * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + // THIS TEST IS LINE NUMBER SENSITIVE + /** - * @test - * @bug 4530424 - * @summary Hin says that doing a step over after a popframe acts like a resume. + * @test + * @bug 4530424 + * @summary Hin says that doing a step over after a popframe acts like a resume. + * @author jjh * - * @author jjh + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g PopAndStepTest.java - * @run driver PopAndStepTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g PopAndStepTest.java + * @run driver PopAndStepTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; @@ -19,25 +41,23 @@ import java.util.*; - /********** LINE NUMBER SENSITIVE! *****************************************************************/ - class PopAndStepTarg { public void B() { - System.out.println("debuggee: in B"); - System.out.println("debuggee: in B, back to A"); // add line breakpoint here line 27 !!! + System.out.println("debuggee: in B"); // B_LINE_1 + System.out.println("debuggee: in B, back to A"); // B_LINE_2 } public void A() { - System.out.println("debuggee: in A, about to call B"); // line 31 - B(); - System.out.println("debuggee: in A, back from B"); // line 33 - throw new RuntimeException("debuggee: Got to line 34"); + System.out.println("debuggee: in A, about to call B"); // A_LINE_1 + B(); // A_LINE_2 + System.out.println("debuggee: in A, back from B"); // A_LINE_3 + throw new RuntimeException("debuggee: Got to line A_LINE_4:" + PopAndStepTest.A_LINE_4); // A_LINE_4 } public static void main(String[] args) { - System.out.println("debuggee: Howdy!"); // line 38 - PopAndStepTarg xxx = new PopAndStepTarg(); // line 40 - xxx.A(); // line 41 + System.out.println("debuggee: Howdy!"); // MAIN_LINE_1 + PopAndStepTarg xxx = new PopAndStepTarg(); // MAIN_LINE_2 + xxx.A(); // MAIN_LINE_3 System.out.println("debugee: Goodbye from PopAndStepTarg!"); } } @@ -46,6 +66,18 @@ /********** test program **********/ public class PopAndStepTest extends TestScaffold { + static final int B_LINE_1 = 46; + static final int B_LINE_2 = B_LINE_1 + 1; + + static final int A_LINE_1 = 51; + static final int A_LINE_2 = A_LINE_1 + 1; + static final int A_LINE_3 = A_LINE_1 + 2; + static final int A_LINE_4 = A_LINE_1 + 3; + + static final int MAIN_LINE_1 = 58; + static final int MAIN_LINE_2 = MAIN_LINE_1 + 1; + static final int MAIN_LINE_3 = MAIN_LINE_1 + 2; + ReferenceType targetClass; ThreadReference mainThread; @@ -116,10 +148,10 @@ BreakpointEvent bpe = startToMain("PopAndStepTarg"); targetClass = bpe.location().declaringType(); mainThread = bpe.thread(); - getDebuggeeLineNum(38); + getDebuggeeLineNum(MAIN_LINE_1); - println("Resuming to line 27"); - bpe = resumeTo("PopAndStepTarg", 27); getDebuggeeLineNum(27); + println("Resuming to line B_LINE_2 : " + B_LINE_2); + bpe = resumeTo("PopAndStepTarg", B_LINE_2); getDebuggeeLineNum(B_LINE_2); // The failure is this: // create step request @@ -141,21 +173,21 @@ srInto.enable(); // This fails mainThread.popFrames(frameFor("A")); //srInto.enable(); // if the enable is moved here, it passes - println("Popped back to line 41 in main, the call to A()"); - println("Stepping into line 31"); - waitForRequestedEvent(srInto); // println + println("Popped back to line MAIN_LINE_3(" + MAIN_LINE_3 + ") in main, the call to A()"); + println("Stepping into line A_LINE_1:" + A_LINE_1); + waitForRequestedEvent(srInto); // println srInto.disable(); - getDebuggeeLineNum(31); + getDebuggeeLineNum(A_LINE_1); // The failure occurs here. - println("Stepping over to line 32"); - stepOverLine(mainThread); // println - getDebuggeeLineNum(32); + println("Stepping over to line A_LINE_2:" + A_LINE_2); + stepOverLine(mainThread); // println + getDebuggeeLineNum(A_LINE_2); - println("Stepping over to line 33"); - stepOverLine(mainThread); // call to B() - getDebuggeeLineNum(33); + println("Stepping over to line A_LINE_3:" + A_LINE_3); + stepOverLine(mainThread); // call to B() + getDebuggeeLineNum(A_LINE_3); vm().exit(0); diff --git a/test/com/sun/jdi/PopAsynchronousTest.java b/test/com/sun/jdi/PopAsynchronousTest.java --- a/test/com/sun/jdi/PopAsynchronousTest.java +++ b/test/com/sun/jdi/PopAsynchronousTest.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4467564 - * @summary Test the popping of frames in an asynchronous context - * (that is, when suspended by the debugger at random points) + * @test + * @bug 4467564 + * @summary Test the popping of frames in an asynchronous context + * (that is, when suspended by the debugger at random points) + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g PopAsynchronousTest.java - * @run driver PopAsynchronousTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g PopAsynchronousTest.java + * @run driver PopAsynchronousTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/PopSynchronousTest.java b/test/com/sun/jdi/PopSynchronousTest.java --- a/test/com/sun/jdi/PopSynchronousTest.java +++ b/test/com/sun/jdi/PopSynchronousTest.java @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4467564 - * @summary Test the popping of frames in synchronous context - * (that is, when stopped at an event) + * @test + * @bug 4467564 + * @summary Test the popping of frames in synchronous context + * (that is, when stopped at an event) + * @author Robert Field * - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g PopSynchronousTest.java - * @run driver PopSynchronousTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g PopSynchronousTest.java + * @run driver PopSynchronousTest */ import com.sun.jdi.*; import com.sun.jdi.event.*; diff --git a/test/com/sun/jdi/PrivateTransportTest.sh b/test/com/sun/jdi/PrivateTransportTest.sh --- a/test/com/sun/jdi/PrivateTransportTest.sh +++ b/test/com/sun/jdi/PrivateTransportTest.sh @@ -24,13 +24,13 @@ # # -# @test PrivateTransportTest.sh -# @bug 6225664 6220618 -# @summary Test for when private transport library outside jdk -# @author Kelly O'Hair +# @test PrivateTransportTest.sh +# @bug 6225664 6220618 +# @summary Test for when private transport library outside jdk +# @author Kelly O'Hair # -# @run compile -g HelloWorld.java -# @run shell PrivateTransportTest.sh +# @run compile -g HelloWorld.java +# @run shell PrivateTransportTest.sh # # Beginning of subroutines: @@ -38,7 +38,7 @@ #Call this from anywhere to fail the test with an error message # usage: fail "reason why the test failed" -fail() +fail() { echo "The test failed :-(" echo "$*" 1>&2 echo "exit status was $status" @@ -47,7 +47,7 @@ #Call this from anywhere to pass the test with a message # usage: pass "reason why the test passed if applicable" -pass() +pass() { echo "The test passed!!!" echo "$*" 1>&2 exit 0 @@ -96,7 +96,7 @@ is_windows=false is_cygwin=false -case `uname -s` in +case `uname -s` in SunOS|Linux|AIX) xx=`find ${jreloc}/lib -name libdt_socket.so` libloc=`dirname ${xx}` @@ -173,7 +173,7 @@ export LD_LIBRARY_PATH echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH} fi -else +else echo "cannot find dt_socket in ${libloc} for ${private_transport}" fail "cannot find dt_socket in ${libloc} for ${private_transport}" fi @@ -193,12 +193,12 @@ else DEBUGGEEFLAGS="$DEBUGGEEFLAGS -agentlib:jdwp=transport=${private_transport},server=y,suspend=n" fi - + echo ${TESTJAVA}/bin/java ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS} eval ${TESTJAVA}/bin/java ${DEBUGGEEFLAGS} ${CP} ${TARGETCLASS} status=$? echo "test status for ${DEBUGGERFLAGS} was: $status" -if [ $status -ne 0 ] ; then +if [ $status -ne 0 ] ; then fail "unspecified test failure" exit 1 fi diff --git a/test/com/sun/jdi/ProcessAttachTest.java b/test/com/sun/jdi/ProcessAttachTest.java --- a/test/com/sun/jdi/ProcessAttachTest.java +++ b/test/com/sun/jdi/ProcessAttachTest.java @@ -43,6 +43,7 @@ * @library /lib/testlibrary * @modules java.management * jdk.jdi + * * @build jdk.testlibrary.* ProcessAttachTest * @run driver ProcessAttachTest */ diff --git a/test/com/sun/jdi/Redefine-g.sh b/test/com/sun/jdi/Redefine-g.sh --- a/test/com/sun/jdi/Redefine-g.sh +++ b/test/com/sun/jdi/Redefine-g.sh @@ -23,12 +23,13 @@ # questions. # -# @test -# @bug 4777868 -# @summary Compile with java -g, do a RedefineClasses, and you don't get local vars -# @author Jim Holmlund +# @test +# @bug 4777868 +# @summary Compile with java -g, do a RedefineClasses, and you don't get local vars +# @author Jim Holmlund # -# @run shell Redefine-g.sh +# @run shell Redefine-g.sh + #pkg=untitled7 # Compile the first version without -g and the 2nd version with -g. @@ -100,7 +101,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineAbstractClass.sh b/test/com/sun/jdi/RedefineAbstractClass.sh --- a/test/com/sun/jdi/RedefineAbstractClass.sh +++ b/test/com/sun/jdi/RedefineAbstractClass.sh @@ -26,12 +26,12 @@ # @test # @bug 6805864 +# @key intermittent # @summary Redefine an abstract class that is called via a concrete # class and via two interface objects and verify that the right # methods are called. # @author Daniel D. Daugherty # -# @key intermittent # @run shell RedefineAbstractClass.sh compileOptions=-g @@ -136,7 +136,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineAddPrivateMethod.sh b/test/com/sun/jdi/RedefineAddPrivateMethod.sh --- a/test/com/sun/jdi/RedefineAddPrivateMethod.sh +++ b/test/com/sun/jdi/RedefineAddPrivateMethod.sh @@ -23,10 +23,11 @@ # questions. # -# @test -# @bug 8149743 -# @summary crash when adding a breakpoint after redefining to add a private static method -# @run shell RedefineAddPrivateMethod.sh +# @test +# @bug 8149743 +# @summary crash when adding a breakpoint after redefining to add a private static method +# +# @run shell RedefineAddPrivateMethod.sh compileOptions=-g @@ -64,7 +65,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineAnnotation.sh b/test/com/sun/jdi/RedefineAnnotation.sh --- a/test/com/sun/jdi/RedefineAnnotation.sh +++ b/test/com/sun/jdi/RedefineAnnotation.sh @@ -23,13 +23,13 @@ # questions. # -# @test -# @bug 5002251 6407335 6412391 -# @summary Redefine a class that has an annotation and verify that the -# new annotation is returned. +# @test +# @bug 5002251 6407335 6412391 +# @key intermittent +# @summary Redefine a class that has an annotation and verify that the +# new annotation is returned. # -# @key intermittent -# @run shell RedefineAnnotation.sh +# @run shell RedefineAnnotation.sh compileOptions=-g @@ -89,7 +89,7 @@ System.out.println("FAIL: class_annotation was NOT changed."); } } - + // field annotations check: try { Field my_field = getClass().getField("dummy_field"); @@ -112,7 +112,7 @@ throw new Error("FAIL: cannot find field 'dummy_field' in " + getClass()); } - + // method annotations check: try { Class params[] = new Class[1]; @@ -136,7 +136,7 @@ } catch (NoSuchMethodException nsme) { throw new Error("FAIL: cannot find method 'hi' in " + getClass()); } - + // method parameter annotations check: try { Class params[] = new Class[1]; @@ -230,7 +230,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineChangeClassOrder.sh b/test/com/sun/jdi/RedefineChangeClassOrder.sh --- a/test/com/sun/jdi/RedefineChangeClassOrder.sh +++ b/test/com/sun/jdi/RedefineChangeClassOrder.sh @@ -23,13 +23,13 @@ # questions. # -# @test -# @bug 6270982 -# @summary Redefine a class so that the order of external classes in -# the constant pool are changed. -# @author dcubed +# @test +# @bug 6270982 +# @summary Redefine a class so that the order of external classes in +# the constant pool are changed. +# @author dcubed # -# @run shell RedefineChangeClassOrder.sh +# @run shell RedefineChangeClassOrder.sh compileOptions=-g @@ -135,7 +135,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineClasses.sh b/test/com/sun/jdi/RedefineClasses.sh --- a/test/com/sun/jdi/RedefineClasses.sh +++ b/test/com/sun/jdi/RedefineClasses.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 4628760 -# @summary RedefineClasses gets assertion: "Should be a method entry in cpcache!" -# @author jjh +# @test +# @bug 4628760 +# @summary RedefineClasses gets assertion: "Should be a method entry in cpcache!" +# @author jjh # -# @run shell/timeout=180 RedefineClasses.sh +# @run shell/timeout=180 RedefineClasses.sh # On windows, with b90, this gets this: # assert(u2_at_bcp >= 0 && u2_at_bcp < old_cache->length(), "Bad cpcache index!") @@ -145,7 +145,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineClearBreakpoint.sh b/test/com/sun/jdi/RedefineClearBreakpoint.sh --- a/test/com/sun/jdi/RedefineClearBreakpoint.sh +++ b/test/com/sun/jdi/RedefineClearBreakpoint.sh @@ -23,17 +23,18 @@ # questions. # -# @test -# @bug 4705330 -# @summary Netbeans Fix and Continue crashes JVM -# @author Jim Holmlund/Swamy Venkataramanappa -# @key intermittent -# @run shell RedefineClearBreakpoint.sh +# @test +# @bug 4705330 +# @key intermittent +# @summary Netbeans Fix and Continue crashes JVM +# @author Jim Holmlund/Swamy Venkataramanappa +# +# @run shell RedefineClearBreakpoint.sh -# The failure occurs after a bkpt is set and then cleared -# after a class redefinition, in a method that was EMCP. -# This sequence creates a state in which subsequent operations -# such as accessing local vars via JVMDI, can cause a hotspot crash. +# The failure occurs after a bkpt is set and then cleared +# after a class redefinition, in a method that was EMCP. +# This sequence creates a state in which subsequent operations +# such as accessing local vars via JVMDI, can cause a hotspot crash. # These are variables that can be set to control execution @@ -43,23 +44,23 @@ cat < $1.java.1 public class $1 { - + public $1() { int a=23; a=m(a); - + } public int m(int b){ int bb=89; System.out.println("$1 - constructor" + b); //@1 breakpoint return b*b; } - + public static void main(java.lang.String[] args) { - new $1(); + new $1(); int jj = 0; //@1 delete } - + } EOF } @@ -87,7 +88,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineCrossEvent.java b/test/com/sun/jdi/RedefineCrossEvent.java --- a/test/com/sun/jdi/RedefineCrossEvent.java +++ b/test/com/sun/jdi/RedefineCrossEvent.java @@ -22,52 +22,52 @@ */ /** - * @test - * @bug 4628726 - * @summary Test class redefinition at each event cross tested with other tests + * @test + * @bug 4628726 + * @summary Test class redefinition at each event cross tested with other tests + * @author Robert Field * - * @author Robert Field + * @modules java.corba + * jdk.jdi * - * @modules java.corba - * jdk.jdi - * @run build TestScaffold VMConnection TargetAdapter TargetListener - * @run compile -g AccessSpecifierTest.java - * @run compile -g AfterThreadDeathTest.java - * @run compile -g ArrayRangeTest.java - * @run compile -g BacktraceFieldTest.java - * @run compile -g ClassesByName2Test.java - * @run compile -g DebuggerThreadTest.java - * @run compile -g DeleteEventRequestsTest.java - * @run compile -g ExceptionEvents.java - * @run compile -g ExpiredRequestDeletionTest.java - * @run compile -g FieldWatchpoints.java - * @run build InstanceFilter - * @run compile -g LocationTest.java - * @run compile -g NewInstanceTest.java - * @run compile -g PopSynchronousTest.java - * @run compile -g RepStepTarg.java - * @run compile -g RequestReflectionTest.java + * @run build TestScaffold VMConnection TargetAdapter TargetListener + * @run compile -g AccessSpecifierTest.java + * @run compile -g AfterThreadDeathTest.java + * @run compile -g ArrayRangeTest.java + * @run compile -g BacktraceFieldTest.java + * @run compile -g ClassesByName2Test.java + * @run compile -g DebuggerThreadTest.java + * @run compile -g DeleteEventRequestsTest.java + * @run compile -g ExceptionEvents.java + * @run compile -g ExpiredRequestDeletionTest.java + * @run compile -g FieldWatchpoints.java + * @run build InstanceFilter + * @run compile -g LocationTest.java + * @run compile -g NewInstanceTest.java + * @run compile -g PopSynchronousTest.java + * @run compile -g RepStepTarg.java + * @run compile -g RequestReflectionTest.java * - * @run driver AccessSpecifierTest -redefstart -redefevent - * @run driver AfterThreadDeathTest -redefstart -redefevent - * @run driver ArrayRangeTest -redefstart -redefevent - * @run driver BacktraceFieldTest -redefstart -redefevent - * @run driver ClassesByName2Test -redefstart -redefevent - * @run driver DebuggerThreadTest -redefstart -redefevent - * @run driver DeleteEventRequestsTest -redefstart -redefevent - * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.Exception - * @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg null - * @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg java.lang.StackOverflowError - * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents -redefstart -redefevent C T StackOverflowCaughtTarg java.lang.Error - * @run driver ExceptionEvents -redefstart -redefevent N T StackOverflowCaughtTarg java.lang.NullPointerException - * @run driver ExceptionEvents -redefstart -redefevent N N StackOverflowCaughtTarg java.lang.Exception - * @run driver ExceptionEvents -redefstart -redefevent C N StackOverflowCaughtTarg java.lang.Error - * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowUncaughtTarg java.lang.Exception - * @run driver ExpiredRequestDeletionTest -redefstart -redefevent - * @run driver FieldWatchpoints -redefstart -redefevent - * @run driver InstanceFilter -redefstart -redefevent - * @run driver LocationTest -redefstart -redefevent - * @run driver NewInstanceTest -redefstart -redefevent - * @run driver RequestReflectionTest -redefstart -redefevent + * @run driver AccessSpecifierTest -redefstart -redefevent + * @run driver AfterThreadDeathTest -redefstart -redefevent + * @run driver ArrayRangeTest -redefstart -redefevent + * @run driver BacktraceFieldTest -redefstart -redefevent + * @run driver ClassesByName2Test -redefstart -redefevent + * @run driver DebuggerThreadTest -redefstart -redefevent + * @run driver DeleteEventRequestsTest -redefstart -redefevent + * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.Exception + * @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg null + * @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg java.lang.StackOverflowError + * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents -redefstart -redefevent C T StackOverflowCaughtTarg java.lang.Error + * @run driver ExceptionEvents -redefstart -redefevent N T StackOverflowCaughtTarg java.lang.NullPointerException + * @run driver ExceptionEvents -redefstart -redefevent N N StackOverflowCaughtTarg java.lang.Exception + * @run driver ExceptionEvents -redefstart -redefevent C N StackOverflowCaughtTarg java.lang.Error + * @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowUncaughtTarg java.lang.Exception + * @run driver ExpiredRequestDeletionTest -redefstart -redefevent + * @run driver FieldWatchpoints -redefstart -redefevent + * @run driver InstanceFilter -redefstart -redefevent + * @run driver LocationTest -redefstart -redefevent + * @run driver NewInstanceTest -redefstart -redefevent + * @run driver RequestReflectionTest -redefstart -redefevent */ diff --git a/test/com/sun/jdi/RedefineCrossStart.java b/test/com/sun/jdi/RedefineCrossStart.java --- a/test/com/sun/jdi/RedefineCrossStart.java +++ b/test/com/sun/jdi/RedefineCrossStart.java @@ -22,29 +22,28 @@ */ /** - * @test - * @bug 4628726 - * @summary Test class redefinition at start only (they use breakpoint - * or resumeTo()) cross tested with other tests. - * ExceptionEvents/StackOverflowUncaughtTarg are here because they hit - * an unrelated crash in event testing. + * @test + * @bug 4628726 + * @summary Test class redefinition at start only (they use breakpoint + * or resumeTo()) cross tested with other tests. + * ExceptionEvents/StackOverflowUncaughtTarg are here because they hit + * an unrelated crash in event testing. * - * @author Robert Field + * @author Robert Field * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g CountEvent.java - * @run compile -g CountFilterTest.java - * @run compile -g FramesTest.java - * @run compile -g InvokeTest.java + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g CountEvent.java + * @run compile -g CountFilterTest.java + * @run compile -g FramesTest.java + * @run compile -g InvokeTest.java * - * @run driver CountEvent -redefstart - * @run driver CountFilterTest -redefstart - * @run driver FramesTest -redefstart - * @run driver InvokeTest -redefstart + * @run driver CountEvent -redefstart + * @run driver CountFilterTest -redefstart + * @run driver FramesTest -redefstart + * @run driver InvokeTest -redefstart * - * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg null - * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.Error - * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.StackOverflowError - * @run driver PopSynchronousTest -redefstart + * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg null + * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.Error + * @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.StackOverflowError + * @run driver PopSynchronousTest -redefstart */ diff --git a/test/com/sun/jdi/RedefineException.sh b/test/com/sun/jdi/RedefineException.sh --- a/test/com/sun/jdi/RedefineException.sh +++ b/test/com/sun/jdi/RedefineException.sh @@ -23,13 +23,13 @@ # questions. # -# @test -# @bug 4559100 -# @summary The VM crashes when a method in a redefined class throws an exception. -# @author Jim Holmlund +# @test +# @bug 4559100 +# @key intermittent +# @summary The VM crashes when a method in a redefined class throws an exception. +# @author Jim Holmlund # -# @key intermittent -# @run shell RedefineException.sh +# @run shell RedefineException.sh # This is another symptomm of 4559100 # This causes a bus error on solsparc: @@ -75,7 +75,7 @@ } System.out.println("a2: done"); } - + public void a3() throws Exception { int a3local = 3; String a3string = "a3"; @@ -105,7 +105,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineFinal.sh b/test/com/sun/jdi/RedefineFinal.sh --- a/test/com/sun/jdi/RedefineFinal.sh +++ b/test/com/sun/jdi/RedefineFinal.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 4788344 -# @summary RedefineClasses is an apparent no-op if instance method is final +# @test +# @bug 4788344 +# @key intermittent +# @summary RedefineClasses is an apparent no-op if instance method is final # -# @key intermittent -# @run shell RedefineFinal.sh +# @run shell RedefineFinal.sh compileOptions=-g compileOptions2=-g @@ -87,7 +87,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineImplementor.sh b/test/com/sun/jdi/RedefineImplementor.sh --- a/test/com/sun/jdi/RedefineImplementor.sh +++ b/test/com/sun/jdi/RedefineImplementor.sh @@ -23,13 +23,12 @@ # questions. # -# @test -# @bug 6173560 -# @summary Redefine a class that implements an interface -# and verify that a subclass calls the right method. +# @test +# @bug 6173560 +# @summary Redefine a class that implements an interface +# and verify that a subclass calls the right method. # -# -# @run shell RedefineImplementor.sh +# @run shell RedefineImplementor.sh compileOptions=-g @@ -81,7 +80,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineIntConstantToLong.sh b/test/com/sun/jdi/RedefineIntConstantToLong.sh --- a/test/com/sun/jdi/RedefineIntConstantToLong.sh +++ b/test/com/sun/jdi/RedefineIntConstantToLong.sh @@ -23,12 +23,12 @@ # questions. # -# @test -# @bug 6394084 -# @summary Redefine class can't handle addition of 64 bit constants in JDK1.5.0_05 +# @test +# @bug 6394084 +# @key intermittent +# @summary Redefine class can't handle addition of 64 bit constants in JDK1.5.0_05 # -# @key intermittent -# @run shell RedefineIntConstantToLong.sh +# @run shell RedefineIntConstantToLong.sh compileOptions=-g compileOptions2=-g @@ -50,13 +50,13 @@ } public long m2(int j) { - System.out.println(System.getProperty("line.separator") + + System.out.println(System.getProperty("line.separator") + "**** public long m2(int j) with value: " + j); return j; } public long m2(long j) { - System.out.println(System.getProperty("line.separator") + + System.out.println(System.getProperty("line.separator") + "**** public long m2(long j) with value: " + j); return j; } @@ -102,7 +102,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefineMulti.sh b/test/com/sun/jdi/RedefineMulti.sh --- a/test/com/sun/jdi/RedefineMulti.sh +++ b/test/com/sun/jdi/RedefineMulti.sh @@ -23,15 +23,15 @@ # questions. # -# @test -# @bug 4724076 -# @summary Redefine does not work in for/while loop -# @author Jim Holmlund/Swamy Venkataramanappa +# @test +# @bug 4724076 +# @summary Redefine does not work in for/while loop. +# The failure occurs when a method is active and +# a method that it calls multiple times is redefined +# more than once. +# @author Jim Holmlund/Swamy Venkataramanappa # -# The failure occurs when a method is active and -# a method that it calls multiple times is redefined -# more than once. -# @run shell/timeout=240 RedefineMulti.sh +# @run shell/timeout=240 RedefineMulti.sh compileOptions=-g #java=java_g @@ -94,7 +94,7 @@ //System.out.println("redefinex 2"); //System.out.println("redefinex 3"); } - + } /********* @@ -138,7 +138,7 @@ for ii in . $TESTSRC $TESTSRC/.. ; do if [ -r "$ii/ShellScaffold.sh" ] ; then - . $ii/ShellScaffold.sh + . $ii/ShellScaffold.sh break fi done diff --git a/test/com/sun/jdi/RedefinePop.sh b/test/com/sun/jdi/RedefinePop.sh --- a/test/com/sun/jdi/RedefinePop.sh +++ b/test/com/sun/jdi/RedefinePop.sh @@ -23,15 +23,15 @@ # questions. # -# @test -# @bug 4622663 -# @summary redefine and pop top frame from jdb gets assertion failure -# @author Jim Holmlund/Swamy Venkataramanappa +# @test +# @bug 4622663 +# @key intermittent +# @summary redefine and pop top frame from jdb gets assertion failure. +# The failure occurs with debug java when the pop deletes the +# line that called the method which is being popped. +# @author Jim Holmlund/Swamy Venkataramanappa # -# 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 +# @run shell RedefinePop.sh # assert(index output.log 2>&1 + > output.log 2>&1 result=$? cat output.log diff --git a/test/java/lang/instrument/RedefineModuleTest.java b/test/java/lang/instrument/RedefineModuleTest.java --- a/test/java/lang/instrument/RedefineModuleTest.java +++ b/test/java/lang/instrument/RedefineModuleTest.java @@ -24,7 +24,7 @@ /** * @test * @summary Basic test for redefineModule - * @modules java.instrument + * * @build java.base/java.lang.TestProvider * java.base/jdk.internal.test.TestProviderImpl1 * java.base/jdk.internal.test.TestProviderImpl2 diff --git a/test/java/lang/instrument/RetransformBigClass.sh b/test/java/lang/instrument/RetransformBigClass.sh --- a/test/java/lang/instrument/RetransformBigClass.sh +++ b/test/java/lang/instrument/RetransformBigClass.sh @@ -23,12 +23,13 @@ # @test # @bug 7122253 8016838 +# @key intermittent # @summary Retransform a big class. # @author Daniel D. Daugherty # -# @key intermittent # @modules java.instrument # java.management +# # @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true' # @run build BigClass RetransformBigClassApp NMTHelper # @run shell/timeout=600 RetransformBigClass.sh diff --git a/test/java/lang/instrument/SingleTransformerTest.java b/test/java/lang/instrument/SingleTransformerTest.java --- a/test/java/lang/instrument/SingleTransformerTest.java +++ b/test/java/lang/instrument/SingleTransformerTest.java @@ -24,13 +24,13 @@ /** * @test * @bug 4882798 + * @key randomness * @summary simple test with one transformer (makes sure it gets called) * @author Gabriel Adauto, Wily Technology * * @run build SingleTransformerTest * @run shell MakeJAR.sh redefineAgent * @run main/othervm -javaagent:redefineAgent.jar SingleTransformerTest SingleTransformerTest - * @key randomness */ public class SingleTransformerTest diff --git a/test/java/lang/instrument/TestAgentWithLimitMods.java b/test/java/lang/instrument/TestAgentWithLimitMods.java --- a/test/java/lang/instrument/TestAgentWithLimitMods.java +++ b/test/java/lang/instrument/TestAgentWithLimitMods.java @@ -26,7 +26,7 @@ * @test * @summary Tests that the -javaagent option adds the java.instrument into * the module graph - * @modules java.instrument + * * @run shell MakeJAR3.sh SimpleAgent * @run main/othervm -javaagent:SimpleAgent.jar --limit-modules java.base TestAgentWithLimitMods * diff --git a/test/java/lang/instrument/TransformMethodTest.java b/test/java/lang/instrument/TransformMethodTest.java --- a/test/java/lang/instrument/TransformMethodTest.java +++ b/test/java/lang/instrument/TransformMethodTest.java @@ -24,13 +24,13 @@ /** * @test * @bug 4882798 + * @key randomness * @summary test transformer add/remove pairs in sequence * @author Gabriel Adauto, Wily Technology * * @run build TransformMethodTest * @run shell MakeJAR.sh redefineAgent * @run main/othervm -javaagent:redefineAgent.jar TransformMethodTest TransformMethodTest - * @key randomness */ import java.lang.instrument.*; diff --git a/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java b/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java --- a/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java +++ b/test/java/lang/instrument/modules/AppendToClassPathModuleTest.java @@ -24,7 +24,9 @@ /** * @test * @bug 8169909 + * * @library src /lib/testlibrary + * * @build test/* * @run shell AppendToClassPathModuleTest.sh * @run main AppendToClassPathModuleTest diff --git a/test/java/lang/management/BufferPoolMXBean/Basic.java b/test/java/lang/management/BufferPoolMXBean/Basic.java --- a/test/java/lang/management/BufferPoolMXBean/Basic.java +++ b/test/java/lang/management/BufferPoolMXBean/Basic.java @@ -23,10 +23,12 @@ /* @test * @bug 6606598 7024172 + * @key randomness * @summary Unit test for java.lang.management.BufferPoolMXBean + * * @modules jdk.management + * * @run main/othervm Basic - * @key randomness */ import java.nio.ByteBuffer; diff --git a/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java b/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java --- a/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java +++ b/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java @@ -28,7 +28,7 @@ * ClassLoadingMXBean.getTotalLoadedClassCount() * ClassLoadingMXBean.getUnloadedClassCount() * @author Alexei Guibadoulline - * @modules java.management + * * @run main/othervm LoadCounts */ diff --git a/test/java/lang/management/CompilationMXBean/Basic.java b/test/java/lang/management/CompilationMXBean/Basic.java --- a/test/java/lang/management/CompilationMXBean/Basic.java +++ b/test/java/lang/management/CompilationMXBean/Basic.java @@ -26,7 +26,6 @@ * @bug 5011189 8004928 * @summary Unit test for java.lang.management.CompilationMXBean * - * @modules java.management * @run main/othervm -Xcomp -Xbatch Basic */ import java.lang.management.*; diff --git a/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java --- a/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java +++ b/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java @@ -30,6 +30,7 @@ * @author Mandy Chung * * @modules java.management/sun.management + * * @compile OpenTypeConverter.java * @build MemoryNotifInfoCompositeData * @run main MemoryNotifInfoCompositeData diff --git a/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java b/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java --- a/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java +++ b/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java @@ -28,7 +28,6 @@ * or throw exception if the input CompositeData is invalid. * @author Mandy Chung * - * @modules java.management * @build MemoryUsageCompositeData * @run main MemoryUsageCompositeData */ diff --git a/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java --- a/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java +++ b/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java @@ -29,7 +29,6 @@ * the input CompositeData is invalid. * @author Mandy Chung * - * @modules java.management * @compile OpenTypeConverter.java * @build ThreadInfoCompositeData * @run main ThreadInfoCompositeData diff --git a/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java b/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java --- a/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java +++ b/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java @@ -26,7 +26,9 @@ * @bug 6396794 * @summary Check that LastGcInfo contents are reasonable * @author Eamonn McManus + * * @modules jdk.management + * * @run main/othervm -XX:-ExplicitGCInvokesConcurrent GcInfoCompositeType */ // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc() diff --git a/test/java/lang/management/MXBean/MXBeanBehavior.java b/test/java/lang/management/MXBean/MXBeanBehavior.java --- a/test/java/lang/management/MXBean/MXBeanBehavior.java +++ b/test/java/lang/management/MXBean/MXBeanBehavior.java @@ -27,7 +27,9 @@ * @summary Check that java.lang.management MXBeans have the same behavior * as user MXBeans * @author Eamonn McManus + * * @modules jdk.management + * * @run main/othervm MXBeanBehavior */ diff --git a/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java b/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java --- a/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java +++ b/test/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java @@ -26,7 +26,9 @@ * @bug 8151099 * @summary Verify platform MXBeans initialized properly with java.management * module only. No other management provider + * * @modules java.management + * * @run main/othervm --limit-modules=java.management DefaultManagementProviderTest */ import java.lang.management.ManagementFactory; diff --git a/test/java/lang/management/ManagementFactory/GetObjectName.java b/test/java/lang/management/ManagementFactory/GetObjectName.java --- a/test/java/lang/management/ManagementFactory/GetObjectName.java +++ b/test/java/lang/management/ManagementFactory/GetObjectName.java @@ -26,7 +26,7 @@ * @summary Test if getObjectName handles properly when called by * multiple threads simultaneously. Run in othervm mode to * make sure the object name is not initialized to begin with. - * @modules java.management + * * @run main/othervm GetObjectName */ diff --git a/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java b/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java --- a/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java +++ b/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java @@ -28,7 +28,6 @@ * methods and PlatformManagedObject.getObjectName() * @author Mandy Chung * - * @modules jdk.management * @run main GetPlatformMXBeans */ diff --git a/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java b/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java --- a/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java +++ b/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java @@ -28,7 +28,6 @@ * ManagementFactory.getPlatformManagementInterfaces() method * @author Frederic Parain * - * @modules jdk.management * @run main GetPlatformManagementInterfaces */ diff --git a/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java b/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java --- a/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java +++ b/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java @@ -27,7 +27,7 @@ * @summary Test that all the platform MXBeans are wrapped in StandardMBean so * an MBeanServer which does not have support for MXBeans can be used. * @author Luis-Miguel Alventosa - * @modules jdk.management + * * @run clean MBeanServerMXBeanUnsupportedTest * @run build MBeanServerMXBeanUnsupportedTest * @run main/othervm MBeanServerMXBeanUnsupportedTest diff --git a/test/java/lang/management/ManagementFactory/MXBeanException.java b/test/java/lang/management/ManagementFactory/MXBeanException.java --- a/test/java/lang/management/ManagementFactory/MXBeanException.java +++ b/test/java/lang/management/ManagementFactory/MXBeanException.java @@ -29,7 +29,6 @@ * * @author Mandy Chung * - * @modules jdk.management * @build MXBeanException * @run main MXBeanException */ diff --git a/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java --- a/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java +++ b/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java @@ -25,9 +25,9 @@ * @test * @bug 5024531 * @summary Basic Test for ManagementFactory.newPlatformMXBean(). - * @modules jdk.management + * @author Mandy Chung + * * @run main/othervm MXBeanProxyTest - * @author Mandy Chung */ import javax.management.*; import java.lang.management.ClassLoadingMXBean; diff --git a/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java --- a/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java +++ b/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java @@ -26,7 +26,6 @@ * @bug 4947536 * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer() * @author Mandy Chung - * @modules jdk.management */ import java.lang.management.*; diff --git a/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/test/java/lang/management/ManagementFactory/ProxyExceptions.java --- a/test/java/lang/management/ManagementFactory/ProxyExceptions.java +++ b/test/java/lang/management/ManagementFactory/ProxyExceptions.java @@ -27,7 +27,6 @@ * @summary Test type mapping of the platform MXBean proxy * returned from Management.newPlatformMXBeanProxy(). * @author Mandy Chung - * @modules jdk.management */ import java.lang.management.*; import javax.management.*; diff --git a/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java --- a/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java +++ b/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java @@ -28,7 +28,6 @@ * returned from Management.newPlatformMXBeanProxy(). * @author Mandy Chung * - * @modules jdk.management * @compile ProxyTypeMapping.java * @run main/othervm -verbose:gc ProxyTypeMapping */ diff --git a/test/java/lang/management/ManagementFactory/TEST.properties b/test/java/lang/management/ManagementFactory/TEST.properties new file mode 100644 --- /dev/null +++ b/test/java/lang/management/ManagementFactory/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.management + diff --git a/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java b/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java --- a/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java +++ b/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java @@ -26,10 +26,8 @@ * @bug 5086470 6358247 7193302 * @summary Test type conversion when invoking ThreadMXBean.dumpAllThreads * through proxy. - * * @author Mandy Chung * - * @modules jdk.management * @run main ThreadMXBeanProxy */ diff --git a/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java --- a/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java +++ b/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java @@ -28,7 +28,6 @@ * MBeanServer. * @author Mandy Chung * - * @modules jdk.management * @compile ValidateOpenTypes.java * @run main/othervm -verbose:gc ValidateOpenTypes */ diff --git a/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java b/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java --- a/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java +++ b/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java @@ -27,13 +27,13 @@ * @summary Basic unit test of memory management testing: * 1) setCollectionUsageThreshold() and getCollectionUsageThreshold() * 2) test notification emitted for two different memory pools. - * * @author Mandy Chung * + * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null" * @library /lib/testlibrary/ * @modules jdk.management + * * @build jdk.testlibrary.* CollectionUsageThreshold MemoryUtil RunUtil - * @requires vm.opt.ExplicitGCInvokesConcurrent == "false" | vm.opt.ExplicitGCInvokesConcurrent == "null" * @run main/timeout=300 CollectionUsageThreshold */ diff --git a/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java b/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java --- a/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java +++ b/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java @@ -28,6 +28,7 @@ * @author Mandy Chung * * @modules jdk.management + * * @run main GetMBeanInfo */ diff --git a/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/test/java/lang/management/MemoryMXBean/LowMemoryTest.java --- a/test/java/lang/management/MemoryMXBean/LowMemoryTest.java +++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest.java @@ -27,17 +27,16 @@ * @summary Basic unit test of memory management testing: * 1) setUsageThreshold() and getUsageThreshold() * 2) test low memory detection on the old generation. - * * @author Mandy Chung * - * @library /lib/testlibrary/ - * @modules java.management - * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil - * @run main/timeout=600 LowMemoryTest * @requires vm.gc == "null" * @requires vm.opt.ExplicitGCInvokesConcurrent != "true" * @requires vm.opt.ExplicitGCInvokesConcurrentAndUnloadsClasses != "true" * @requires vm.opt.DisableExplicitGC != "true" + * @library /lib/testlibrary/ + * + * @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil + * @run main/timeout=600 LowMemoryTest */ import java.lang.management.*; diff --git a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh --- a/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh +++ b/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh @@ -25,8 +25,9 @@ # @test # @bug 4982128 # @summary Test low memory detection of non-heap memory pool +# # @requires vm.gc=="null" -# @modules java.management +# # @run build LowMemoryTest2 MemoryUtil # @run shell/timeout=600 LowMemoryTest2.sh # @@ -51,10 +52,10 @@ } # Run test with each GC configuration -# +# # Notes: To ensure that metaspace fills up we disable class unloading. # Also we set the max metaspace to 8MB - otherwise the test takes too -# long to run. +# long to run. go -noclassgc -XX:MaxMetaspaceSize=16m -XX:+UseSerialGC LowMemoryTest2 go -noclassgc -XX:MaxMetaspaceSize=16m -XX:+UseParallelGC LowMemoryTest2 diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagement.java b/test/java/lang/management/MemoryMXBean/MemoryManagement.java --- a/test/java/lang/management/MemoryMXBean/MemoryManagement.java +++ b/test/java/lang/management/MemoryMXBean/MemoryManagement.java @@ -27,10 +27,10 @@ * @summary Basic unit test of memory management testing: * 1) setUsageThreshold() and getUsageThreshold() * 2) test low memory detection on the old generation. - * * @author Mandy Chung * * @modules jdk.management + * * @build MemoryManagement MemoryUtil * @run main/othervm/timeout=600 -Xmn8m -XX:+IgnoreUnrecognizedVMOptions -XX:G1HeapRegionSize=1 -XX:-UseLargePages MemoryManagement */ diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh @@ -26,8 +26,9 @@ # @bug 4530538 # @summary Run MemoryManagement test with concurrent mark sweep GC # @author Mandy Chung +# # @requires vm.gc=="ConcMarkSweep" | vm.gc=="null" -# @modules java.management +# # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementConcMarkSweepGC.sh # @@ -42,7 +43,7 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2 } diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh @@ -26,8 +26,9 @@ # @bug 4530538 # @summary Run MemoryManagement test with parallel GC # @author Mandy Chung +# # @requires vm.gc=="Parallel" | vm.gc=="null" -# @modules java.management +# # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementParallelGC.sh # @@ -42,7 +43,7 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2 } diff --git a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh @@ -26,8 +26,9 @@ # @bug 4530538 # @summary Run MemoryManagement test with serial GC # @author Mandy Chung +# # @requires vm.gc=="Serial" | vm.gc=="null" -# @modules java.management +# # @run build MemoryManagement # @run shell/timeout=600 MemoryManagementSerialGC.sh # @@ -42,7 +43,7 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2 } diff --git a/test/java/lang/management/MemoryMXBean/MemoryTest.java b/test/java/lang/management/MemoryMXBean/MemoryTest.java --- a/test/java/lang/management/MemoryMXBean/MemoryTest.java +++ b/test/java/lang/management/MemoryMXBean/MemoryTest.java @@ -29,6 +29,7 @@ * @author Mandy Chung * * @modules jdk.management + * * @run main MemoryTest 2 */ diff --git a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh --- a/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh +++ b/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh @@ -24,10 +24,11 @@ # # @test # @bug 4530538 -# @summary +# @summary # @author Mandy Chung +# # @requires vm.gc=="Parallel" | vm.gc=="null" -# @modules java.management +# # @run compile MemoryTest.java # @run shell MemoryTestAllGC.sh # @@ -42,7 +43,7 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2 } diff --git a/test/java/lang/management/MemoryMXBean/Pending.java b/test/java/lang/management/MemoryMXBean/Pending.java --- a/test/java/lang/management/MemoryMXBean/Pending.java +++ b/test/java/lang/management/MemoryMXBean/Pending.java @@ -24,8 +24,6 @@ /* * @test * @bug 4530538 - * @modules java.base/jdk.internal.misc - * java.management * @summary Basic unit test of * RuntimeMXBean.getObjectPendingFinalizationCount() * 1. GC and runFinalization() to get the current pending number @@ -34,6 +32,9 @@ * 4. GC and runFinalization() and the finalizable objects should * be garbage collected. * @author Alexei Guibadoulline and Mandy Chung + * + * @modules java.base/jdk.internal.misc + * java.management */ import java.lang.management.*; diff --git a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh --- a/test/java/lang/management/MemoryMXBean/PendingAllGC.sh +++ b/test/java/lang/management/MemoryMXBean/PendingAllGC.sh @@ -24,11 +24,13 @@ # # @test # @bug 4530538 -# @summary +# @summary # @author Mandy Chung +# # @requires vm.gc=="null" # @modules java.base/jdk.internal.misc # java.management +# # @run compile Pending.java # @run shell PendingAllGC.sh # @@ -43,7 +45,7 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java ${TESTVMOPTS} -classpath $TESTCLASSES $@ || exit 2 } @@ -52,7 +54,7 @@ runOne Pending # Test Pending with parallel scavenger collector -runOne -XX:+UseParallelGC Pending +runOne -XX:+UseParallelGC Pending # Test Pending with concurrent collector runOne -XX:+UseConcMarkSweepGC Pending diff --git a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java --- a/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java +++ b/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java @@ -32,13 +32,14 @@ * @summary Basic Test for MemoryPool.resetPeakUsage() * @author Mandy Chung * - * @library /lib/testlibrary/ - * @modules jdk.management - * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil - * @run main ResetPeakMemoryUsage * @requires vm.opt.ExplicitGCInvokesConcurrent != "true" * @requires vm.opt.ExplicitGCInvokesConcurrentAndUnloadsClasses != "true" * @requires vm.opt.DisableExplicitGC != "true" + * @library /lib/testlibrary/ + * @modules jdk.management + * + * @build jdk.testlibrary.* ResetPeakMemoryUsage MemoryUtil RunUtil + * @run main ResetPeakMemoryUsage */ import java.lang.management.*; diff --git a/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java b/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java --- a/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java +++ b/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java @@ -28,7 +28,6 @@ * MemoryPoolMXBean.isCollectionThresholdExceeded(). * @author Mandy Chung * - * @modules java.management * @run main/othervm ThresholdTest */ diff --git a/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java b/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java --- a/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java +++ b/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java @@ -30,6 +30,7 @@ * * @modules java.management * jdk.management + * * @run main PlatformMXBeanTest */ diff --git a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh --- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh +++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh @@ -23,11 +23,10 @@ # # @test +# @bug 6336608 6367473 6511738 # @summary Tests OperatingSystemMXBean.getSystemLoadAverage() api. # @author Mandy Chung -# @bug 6336608 6367473 6511738 # -# @modules java.management # @run build GetSystemLoadAverage # @run shell/timeout=300 TestSystemLoadAvg.sh # diff --git a/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java b/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java --- a/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java +++ b/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java @@ -30,6 +30,7 @@ * java/util/logging/LoggingMXBeanTest. * * @modules jdk.management + * * @build PlatformLoggingMXBeanTest * @run main PlatformLoggingMXBeanTest */ diff --git a/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java --- a/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java +++ b/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java @@ -26,7 +26,6 @@ * @bug 4990512 * @summary Basic Test for RuntimeMXBean.getSystemProperties(). * @author Mandy Chung - * @modules java.management */ import java.lang.management.ManagementFactory; diff --git a/test/java/lang/management/RuntimeMXBean/PropertiesTest.java b/test/java/lang/management/RuntimeMXBean/PropertiesTest.java --- a/test/java/lang/management/RuntimeMXBean/PropertiesTest.java +++ b/test/java/lang/management/RuntimeMXBean/PropertiesTest.java @@ -28,7 +28,6 @@ * properties contain another list of properties as the defaults. * @author Mandy Chung * - * @modules java.management * @run build PropertiesTest * @run main PropertiesTest */ diff --git a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh --- a/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh +++ b/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh @@ -24,9 +24,9 @@ # # @test # @bug 4530538 -# @summary +# @summary # @author Mandy Chung -# @modules java.management +# # @run compile InputArgument.java # @run shell TestInputArgument.sh # @@ -41,12 +41,12 @@ fi runOne() -{ +{ echo "runOne $@" $TESTJAVA/bin/java $TESTVMOPTS -classpath $TESTCLASSES "$@" || exit 2 } -runOne InputArgument +runOne InputArgument runOne -XX:+UseFastJNIAccessors -Xlog:gc*=debug InputArgument runOne -XX:+UseFastJNIAccessors -Xlog:gc*=debug InputArgument -XX:+UseFastJNIAccessors diff --git a/test/java/lang/management/RuntimeMXBean/UpTime.java b/test/java/lang/management/RuntimeMXBean/UpTime.java --- a/test/java/lang/management/RuntimeMXBean/UpTime.java +++ b/test/java/lang/management/RuntimeMXBean/UpTime.java @@ -26,7 +26,6 @@ * @bug 4530538 * @summary Basic unit test of RuntimeMXBean.getUptime() * @author Alexei Guibadoulline - * @modules java.management */ import java.lang.management.*; diff --git a/test/java/lang/management/TEST.properties b/test/java/lang/management/TEST.properties new file mode 100644 --- /dev/null +++ b/test/java/lang/management/TEST.properties @@ -0,0 +1,2 @@ +modules = java.management + diff --git a/test/java/lang/management/ThreadMXBean/AllThreadIds.java b/test/java/lang/management/ThreadMXBean/AllThreadIds.java --- a/test/java/lang/management/ThreadMXBean/AllThreadIds.java +++ b/test/java/lang/management/ThreadMXBean/AllThreadIds.java @@ -24,11 +24,10 @@ /* * @test * @bug 4530538 + * @key intermittent * @summary Basic unit test of ThreadMXBean.getAllThreadIds() * @author Alexei Guibadoulline and Mandy Chung * - * @key intermittent - * @modules java.management * @run main/othervm AllThreadIds */ diff --git a/test/java/lang/management/ThreadMXBean/DisableTest.java b/test/java/lang/management/ThreadMXBean/DisableTest.java --- a/test/java/lang/management/ThreadMXBean/DisableTest.java +++ b/test/java/lang/management/ThreadMXBean/DisableTest.java @@ -27,7 +27,6 @@ * @summary The capability is disabled regardless of number of times * it was enabled. * @author Mandy Chung - * @modules java.management */ import java.lang.management.ThreadMXBean; diff --git a/test/java/lang/management/ThreadMXBean/EnableTest.java b/test/java/lang/management/ThreadMXBean/EnableTest.java --- a/test/java/lang/management/ThreadMXBean/EnableTest.java +++ b/test/java/lang/management/ThreadMXBean/EnableTest.java @@ -29,7 +29,6 @@ * and ThreadMXBean.setThreadCpuTimeEnabled(). * @author Mandy Chung * - * @modules java.management * @run main EnableTest */ diff --git a/test/java/lang/management/ThreadMXBean/FindDeadlocks.java b/test/java/lang/management/ThreadMXBean/FindDeadlocks.java --- a/test/java/lang/management/ThreadMXBean/FindDeadlocks.java +++ b/test/java/lang/management/ThreadMXBean/FindDeadlocks.java @@ -31,7 +31,6 @@ * - ThreadMXBean.findMonitorDeadlockedThreads() * @author Mandy Chung * - * @modules java.management * @build MonitorDeadlock * @build SynchronizerDeadlock * @build ThreadDump diff --git a/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java b/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java --- a/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java +++ b/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java @@ -28,7 +28,6 @@ * - ThreadMXBean.findMonitorDeadlockedThreads() * @author Mandy Chung * - * @modules java.management * @build MonitorDeadlock * @build ThreadDump * @run main/othervm FindMonitorDeadlock diff --git a/test/java/lang/management/ThreadMXBean/InvalidThreadID.java b/test/java/lang/management/ThreadMXBean/InvalidThreadID.java --- a/test/java/lang/management/ThreadMXBean/InvalidThreadID.java +++ b/test/java/lang/management/ThreadMXBean/InvalidThreadID.java @@ -28,7 +28,6 @@ * if id <= 0 and returns -1 if the thread doesn't exist. * @author Mandy Chung * - * @modules java.management * @run main InvalidThreadID */ diff --git a/test/java/lang/management/ThreadMXBean/LockedMonitors.java b/test/java/lang/management/ThreadMXBean/LockedMonitors.java --- a/test/java/lang/management/ThreadMXBean/LockedMonitors.java +++ b/test/java/lang/management/ThreadMXBean/LockedMonitors.java @@ -34,7 +34,6 @@ * * @author Mandy Chung * - * @modules java.management * @build Barrier * @build LockingThread * @build ThreadDump diff --git a/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java b/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java --- a/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java +++ b/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java @@ -30,7 +30,6 @@ * * @author Mandy Chung * - * @modules java.management * @build Barrier * @build SynchronizerLockingThread * @build ThreadDump diff --git a/test/java/lang/management/ThreadMXBean/Locks.java b/test/java/lang/management/ThreadMXBean/Locks.java --- a/test/java/lang/management/ThreadMXBean/Locks.java +++ b/test/java/lang/management/ThreadMXBean/Locks.java @@ -26,11 +26,11 @@ * @bug 4530538 * @summary Basic unit test of ThreadInfo.getLockName() * and ThreadInfo.getLockOwnerName() - * @library /lib/testlibrary * @author Mandy Chung * @author Jaroslav Bachorik * - * @modules java.management + * @library /lib/testlibrary + * * @build jdk.testlibrary.* * @run main/othervm Locks */ diff --git a/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java b/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java --- a/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java +++ b/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java @@ -28,7 +28,6 @@ * and getThreadInfo of customized JSR-166 synchronizers. * @author Mandy Chung * - * @modules java.management * @build Barrier * @build ThreadDump * @run main/othervm MyOwnSynchronizer diff --git a/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java b/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java --- a/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java +++ b/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java @@ -29,7 +29,6 @@ * @author Mandy Chung * @author Jaroslav Bachorik * - * @modules java.management * @build ResetPeakThreadCount * @build ThreadDump * @run main/othervm ResetPeakThreadCount diff --git a/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java b/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java --- a/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java +++ b/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java @@ -28,7 +28,6 @@ * in shared mode which has no owner when a thread is parked. * @author Mandy Chung * - * @modules java.management * @run main/othervm SharedSynchronizer */ diff --git a/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java b/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java --- a/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java +++ b/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java @@ -25,11 +25,9 @@ * @test * @bug 4530538 * @summary Basic unit test of the synchronization statistics support: - * * @author Mandy Chung * @author Jaroslav Bachorik * - * @modules java.management * @run main/othervm SynchronizationStatistics */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java b/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java --- a/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java +++ b/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java @@ -27,7 +27,7 @@ * @summary Basic unit test of ThreadInfo.getBlockedCount() * @author Alexei Guibadoulline and Mandy Chung * @author Jaroslav Bachorik - * @modules java.management + * * @run main ThreadBlockedCount */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadCounts.java b/test/java/lang/management/ThreadMXBean/ThreadCounts.java --- a/test/java/lang/management/ThreadMXBean/ThreadCounts.java +++ b/test/java/lang/management/ThreadMXBean/ThreadCounts.java @@ -30,7 +30,6 @@ * mbean.getDaemonThreadCount() * @author Alexei Guibadoulline * - * @modules java.management * @run main ThreadCounts */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java b/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java --- a/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java +++ b/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java @@ -27,7 +27,6 @@ * @summary Basic test of ThreadMXBean.getThreadCpuTime and * getCurrentThreadCpuTime. * @author Mandy Chung - * @modules java.management */ import java.lang.management.*; diff --git a/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java b/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java --- a/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java +++ b/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java @@ -31,7 +31,6 @@ * @bug 6588467 * @summary Basic test of ThreadInfo.isDaemon * @author Jeremy Manson - * @modules java.management */ public class ThreadDaemonTest { diff --git a/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java b/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java --- a/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java +++ b/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java @@ -26,11 +26,11 @@ * @bug 5058327 8074368 * @summary Tests the correct behaviour of getThreadInfo(long[]) for non-existent * thread IDs and the empty thread id array. - * * @author Mandy Chung * @author Jaroslav Bachorik * * @modules jdk.management + * * @build ThreadInfoArray * @run main ThreadInfoArray */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadLists.java b/test/java/lang/management/ThreadMXBean/ThreadLists.java --- a/test/java/lang/management/ThreadMXBean/ThreadLists.java +++ b/test/java/lang/management/ThreadMXBean/ThreadLists.java @@ -26,7 +26,6 @@ * @bug 5047639 * @summary Check that the "java-level" APIs provide a consistent view of * the thread list - * @modules java.management */ import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; diff --git a/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java b/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java --- a/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java +++ b/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java @@ -27,12 +27,11 @@ * @summary Basic unit test of thread states returned by * ThreadMXBean.getThreadInfo.getThreadState(). * It also tests lock information returned by ThreadInfo. - * * @author Mandy Chung * * @library ../../Thread * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* * @build ThreadMXBeanStateTest ThreadStateController * @run main ThreadMXBeanStateTest diff --git a/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java b/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java --- a/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java +++ b/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java @@ -28,7 +28,6 @@ * ThreadInfo.getThreadState() * @author Mandy Chung * - * @modules java.management * @run build Utils * @run main ThreadStackTrace */ diff --git a/test/java/lang/management/ThreadMXBean/ThreadUserTime.java b/test/java/lang/management/ThreadMXBean/ThreadUserTime.java --- a/test/java/lang/management/ThreadMXBean/ThreadUserTime.java +++ b/test/java/lang/management/ThreadMXBean/ThreadUserTime.java @@ -27,7 +27,6 @@ * @summary Basic test of ThreadMXBean.getThreadUserTime and * getCurrentThreadUserTime. * @author Mandy Chung - * @modules java.management */ import java.lang.management.*; diff --git a/test/javax/management/ImplementationVersion/ImplVersionTest.java b/test/javax/management/ImplementationVersion/ImplVersionTest.java --- a/test/javax/management/ImplementationVersion/ImplVersionTest.java +++ b/test/javax/management/ImplementationVersion/ImplVersionTest.java @@ -29,7 +29,7 @@ * test codebase has the java permission to read the "java.runtime.version" * system property. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ImplVersionTest ImplVersionCommand * @run build ImplVersionTest ImplVersionCommand ImplVersionReader * @run main ImplVersionTest diff --git a/test/javax/management/Introspector/AnnotationSecurityTest.java b/test/javax/management/Introspector/AnnotationSecurityTest.java --- a/test/javax/management/Introspector/AnnotationSecurityTest.java +++ b/test/javax/management/Introspector/AnnotationSecurityTest.java @@ -27,7 +27,7 @@ * @summary Test that having a security manager doesn't trigger a * NotCompliantMBeanException * @author Daniel Fuchs, Yves Joan - * @modules java.management + * * @run clean AnnotationSecurityTest Described UnDescribed DescribedMBean * UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean * @run build AnnotationSecurityTest Described UnDescribed DescribedMBean diff --git a/test/javax/management/Introspector/AnnotationTest.java b/test/javax/management/Introspector/AnnotationTest.java --- a/test/javax/management/Introspector/AnnotationTest.java +++ b/test/javax/management/Introspector/AnnotationTest.java @@ -27,7 +27,7 @@ * @summary Test that annotations in Standard MBean interfaces * correctly produce Descriptor entries * @author Eamonn McManus - * @modules java.management + * * @run clean AnnotationTest * @run build AnnotationTest * @run main AnnotationTest diff --git a/test/javax/management/Introspector/ChangingNotifsTest.java b/test/javax/management/Introspector/ChangingNotifsTest.java --- a/test/javax/management/Introspector/ChangingNotifsTest.java +++ b/test/javax/management/Introspector/ChangingNotifsTest.java @@ -27,7 +27,7 @@ * @summary Check that Standard MBeans can change their MBeanNotificationInfo[] * and MXBeans cannot * @author Eamonn McManus - * @modules java.management + * * @run clean ChangingNotifsTest * @run build ChangingNotifsTest * @run main ChangingNotifsTest diff --git a/test/javax/management/Introspector/ClassLeakTest.java b/test/javax/management/Introspector/ClassLeakTest.java --- a/test/javax/management/Introspector/ClassLeakTest.java +++ b/test/javax/management/Introspector/ClassLeakTest.java @@ -26,7 +26,7 @@ * @bug 4909536 * @summary Ensure that the Introspector does not retain refs to classes * @author Eamonn McManus - * @modules java.management + * * @run clean ClassLeakTest * @run build ClassLeakTest * @run main ClassLeakTest diff --git a/test/javax/management/Introspector/DuplicateGetterTest.java b/test/javax/management/Introspector/DuplicateGetterTest.java --- a/test/javax/management/Introspector/DuplicateGetterTest.java +++ b/test/javax/management/Introspector/DuplicateGetterTest.java @@ -27,7 +27,6 @@ * @summary Test that an MBean interface can inherit two methods with * the same signature from two unrelated parent interfaces * @author Eamonn McManus - * @modules java.management */ import java.util.*; diff --git a/test/javax/management/Introspector/FeatureOrderTest.java b/test/javax/management/Introspector/FeatureOrderTest.java --- a/test/javax/management/Introspector/FeatureOrderTest.java +++ b/test/javax/management/Introspector/FeatureOrderTest.java @@ -27,7 +27,6 @@ * @summary Test that attributes and operations appear in the same order * in MBeanInfo as they did in the Standard MBean or MXBean Interface. * @author Eamonn McManus - * @modules java.management */ /* diff --git a/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java b/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java --- a/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java +++ b/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java @@ -27,7 +27,7 @@ * @summary Test that the exception thrown by DynamicMBean.getMBeanInfo() * keeps the init cause. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean GetMBeanInfoExceptionTest * @run build GetMBeanInfoExceptionTest * @run main GetMBeanInfoExceptionTest diff --git a/test/javax/management/Introspector/IdenticalMBeanInfoTest.java b/test/javax/management/Introspector/IdenticalMBeanInfoTest.java --- a/test/javax/management/Introspector/IdenticalMBeanInfoTest.java +++ b/test/javax/management/Introspector/IdenticalMBeanInfoTest.java @@ -27,7 +27,7 @@ * @summary Check that MBeans with the same class have identical MBeanInfo * unless they are NotificationBroadcasters * @author Eamonn McManus - * @modules java.management + * * @run clean IdenticalMBeanInfoTest * @run build IdenticalMBeanInfoTest * @run main IdenticalMBeanInfoTest diff --git a/test/javax/management/Introspector/ImmutableNotificationInfoTest.java b/test/javax/management/Introspector/ImmutableNotificationInfoTest.java --- a/test/javax/management/Introspector/ImmutableNotificationInfoTest.java +++ b/test/javax/management/Introspector/ImmutableNotificationInfoTest.java @@ -27,7 +27,7 @@ * @summary Check that a StandardMBean has immutableInfo=true if it is * a NotificationBroadcasterSupport that doesn't override getNotificationInfo() * @author Eamonn McManus - * @modules java.management + * * @run clean ImmutableNotificationInfoTest * @run build ImmutableNotificationInfoTest * @run main ImmutableNotificationInfoTest diff --git a/test/javax/management/Introspector/InvokeGettersTest.java b/test/javax/management/Introspector/InvokeGettersTest.java --- a/test/javax/management/Introspector/InvokeGettersTest.java +++ b/test/javax/management/Introspector/InvokeGettersTest.java @@ -26,7 +26,7 @@ * @bug 6317101 * @summary Test that the jmx.invoke.getters system property works * @author Eamonn McManus - * @modules java.management + * * @run clean InvokeGettersTest * @run build InvokeGettersTest * @run main InvokeGettersTest diff --git a/test/javax/management/Introspector/IsMethodTest.java b/test/javax/management/Introspector/IsMethodTest.java --- a/test/javax/management/Introspector/IsMethodTest.java +++ b/test/javax/management/Introspector/IsMethodTest.java @@ -26,7 +26,7 @@ * @bug 4947001 4954369 4954409 4954410 * @summary Test that "Boolean isX()" and "int isX()" define operations * @author Eamonn McManus - * @modules java.management + * * @run clean IsMethodTest * @run build IsMethodTest * @run main IsMethodTest diff --git a/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java b/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java --- a/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java +++ b/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java @@ -37,8 +37,10 @@ * j.b.ConstructorProperties and j.m.ConstructorProperties annotations * only j.m.ConstructorProperties annotation is considered. * @author Jaroslav Bachorik - * @modules java.management - * java.desktop + * + * @modules java.desktop + * java.management + * * @run main LegacyConstructorPropertiesTest */ diff --git a/test/javax/management/Introspector/NotAnMBeanTest.java b/test/javax/management/Introspector/NotAnMBeanTest.java --- a/test/javax/management/Introspector/NotAnMBeanTest.java +++ b/test/javax/management/Introspector/NotAnMBeanTest.java @@ -26,7 +26,7 @@ * @bug 4914805 * @summary Ensure that the right exception is thrown for illegal MBeans * @author Eamonn McManus - * @modules java.management + * * @run clean NotAnMBeanTest * @run build NotAnMBeanTest * @run main NotAnMBeanTest diff --git a/test/javax/management/Introspector/NotCompliantCauseTest.java b/test/javax/management/Introspector/NotCompliantCauseTest.java --- a/test/javax/management/Introspector/NotCompliantCauseTest.java +++ b/test/javax/management/Introspector/NotCompliantCauseTest.java @@ -27,7 +27,7 @@ * @summary Test that NotCompliantMBeanException has a cause in case of * type mapping problems. * @author Daniel Fuchs, Alexander Shusherov - * @modules java.management + * * @run clean NotCompliantCauseTest * @run build NotCompliantCauseTest * @run main NotCompliantCauseTest diff --git a/test/javax/management/Introspector/SetWrongTypeAttributeTest.java b/test/javax/management/Introspector/SetWrongTypeAttributeTest.java --- a/test/javax/management/Introspector/SetWrongTypeAttributeTest.java +++ b/test/javax/management/Introspector/SetWrongTypeAttributeTest.java @@ -27,7 +27,7 @@ * @summary Check that setting the wrong type of an attribute in a Standard * MBean or MXBean causes InvalidAttributeValueException * @author Eamonn McManus - * @modules java.management + * * @run clean SetWrongTypeAttributeTest * @run build SetWrongTypeAttributeTest * @run main SetWrongTypeAttributeTest diff --git a/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java b/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java --- a/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java +++ b/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java @@ -28,7 +28,7 @@ * the supplied MBean although DynamicMBean.getMBeanInfo() throws * a runtime exception. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean UnregisterMBeanExceptionTest * @run build UnregisterMBeanExceptionTest * @run main UnregisterMBeanExceptionTest diff --git a/test/javax/management/MBeanInfo/EqualExceptionTest.java b/test/javax/management/MBeanInfo/EqualExceptionTest.java --- a/test/javax/management/MBeanInfo/EqualExceptionTest.java +++ b/test/javax/management/MBeanInfo/EqualExceptionTest.java @@ -26,7 +26,7 @@ * @bug 5071110 * @summary Test whether an null descriptor will cause an NullPointerException. * @author Shanliang JIANG - * @modules java.management + * * @run clean EqualExceptionTest * @run build EqualExceptionTest * @run main EqualExceptionTest diff --git a/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java b/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java --- a/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java @@ -36,7 +36,7 @@ * @bug 8023954 * @summary Test that MBean*Info.equals do not throw NPE * @author Shanliang JIANG - * @modules java.management + * * @run clean MBeanInfoEqualsNPETest * @run build MBeanInfoEqualsNPETest * @run main MBeanInfoEqualsNPETest diff --git a/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java b/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java --- a/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java @@ -26,7 +26,7 @@ * @bug 4719923 * @summary Test that MBeanInfo.equals works even for mutable subclasses * @author Eamonn McManus - * @modules java.management + * * @run clean MBeanInfoEqualsTest * @run build MBeanInfoEqualsTest * @run main MBeanInfoEqualsTest diff --git a/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java b/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java --- a/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java +++ b/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java @@ -35,7 +35,7 @@ * @bug 8023669 * @summary Test that hashCode()throws NullPointerException * @author Shanliang JIANG - * @modules java.management + * * @run clean MBeanInfoHashCodeNPETest * @run build MBeanInfoHashCodeNPETest * @run main MBeanInfoHashCodeNPETest diff --git a/test/javax/management/MBeanInfo/NotificationInfoTest.java b/test/javax/management/MBeanInfo/NotificationInfoTest.java --- a/test/javax/management/MBeanInfo/NotificationInfoTest.java +++ b/test/javax/management/MBeanInfo/NotificationInfoTest.java @@ -27,7 +27,9 @@ * @summary Test that JMX classes use fully-qualified class names * in MBeanNotificationInfo * @author Eamonn McManus + * * @modules java.management.rmi + * * @run clean NotificationInfoTest * @run build NotificationInfoTest * @run main NotificationInfoTest diff --git a/test/javax/management/MBeanInfo/NullInfoArraysTest.java b/test/javax/management/MBeanInfo/NullInfoArraysTest.java --- a/test/javax/management/MBeanInfo/NullInfoArraysTest.java +++ b/test/javax/management/MBeanInfo/NullInfoArraysTest.java @@ -27,7 +27,7 @@ * @summary Test that an MBeanInfo works even if it is deserialized from * an implementation where its array fields can be null. * @author Eamonn McManus - * @modules java.management + * * @run clean NullInfoArraysTest * @run build NullInfoArraysTest * @run main NullInfoArraysTest diff --git a/test/javax/management/MBeanInfo/SerializationTest.java b/test/javax/management/MBeanInfo/SerializationTest.java --- a/test/javax/management/MBeanInfo/SerializationTest.java +++ b/test/javax/management/MBeanInfo/SerializationTest.java @@ -26,7 +26,7 @@ * @bug 6288100 * @summary Test the new serialization/deserialization methods. * @author Shanliang JIANG - * @modules java.management + * * @run clean SerializationTest * @run build SerializationTest * @run main SerializationTest diff --git a/test/javax/management/MBeanInfo/SerializationTest1.java b/test/javax/management/MBeanInfo/SerializationTest1.java --- a/test/javax/management/MBeanInfo/SerializationTest1.java +++ b/test/javax/management/MBeanInfo/SerializationTest1.java @@ -26,7 +26,7 @@ * @bug 6783290 * @summary Test correct reading of an empty Descriptor. * @author Jaroslav Bachorik - * @modules java.management + * * @run clean SerializationTest1 * @run build SerializationTest1 * @run main SerializationTest1 diff --git a/test/javax/management/MBeanInfo/TooManyFooTest.java b/test/javax/management/MBeanInfo/TooManyFooTest.java --- a/test/javax/management/MBeanInfo/TooManyFooTest.java +++ b/test/javax/management/MBeanInfo/TooManyFooTest.java @@ -27,7 +27,7 @@ * @summary Test that a method inherited from two different interfaces * appears only once in MBeanInfo. * @author dfuchs - * @modules java.management + * * @run clean TooManyFooTest * @run build TooManyFooTest * @run main TooManyFooTest diff --git a/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java b/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java --- a/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java +++ b/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java @@ -26,7 +26,6 @@ * @bug 6336968 * @summary Test adding non-Attribute values to an AttributeList. * @author Eamonn McManus - * @modules java.management */ import java.util.Collections; diff --git a/test/javax/management/MBeanServer/ExceptionTest.java b/test/javax/management/MBeanServer/ExceptionTest.java --- a/test/javax/management/MBeanServer/ExceptionTest.java +++ b/test/javax/management/MBeanServer/ExceptionTest.java @@ -26,7 +26,9 @@ * @bug 8058865 * @summary Checks that exceptions are correctly wired (compared to reference). * @author Olivier Lagneau + * * @modules java.management.rmi + * * @run main/othervm/timeout=300 -DDEBUG_STANDARD ExceptionTest */ diff --git a/test/javax/management/MBeanServer/MBeanExceptionTest.java b/test/javax/management/MBeanServer/MBeanExceptionTest.java --- a/test/javax/management/MBeanServer/MBeanExceptionTest.java +++ b/test/javax/management/MBeanServer/MBeanExceptionTest.java @@ -28,8 +28,7 @@ * RuntimeMBeanException and (for Standard MBeans) that checked exceptions * are wrapped in MBeanException * @author Eamonn McManus - * @modules java.management - * @compile MBeanExceptionTest.java + * * @run main MBeanExceptionTest */ diff --git a/test/javax/management/MBeanServer/MBeanFallbackTest.java b/test/javax/management/MBeanServer/MBeanFallbackTest.java --- a/test/javax/management/MBeanServer/MBeanFallbackTest.java +++ b/test/javax/management/MBeanServer/MBeanFallbackTest.java @@ -33,7 +33,7 @@ * It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic" * system property must be set before c.s.j.m.MBeanAnalyzer has been loaded. * @author Jaroslav Bachorik - * @modules java.management + * * @run clean MBeanFallbackTest * @run build MBeanFallbackTest * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MBeanFallbackTest diff --git a/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java b/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java --- a/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java +++ b/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java @@ -26,7 +26,7 @@ * @bug 5092515 * @summary Test how to unwrap a user specific exception * @author Shanliang JIANG - * @modules java.management + * * @run clean MBeanServerInvocationHandlerExceptionTest * @run build MBeanServerInvocationHandlerExceptionTest * @run main MBeanServerInvocationHandlerExceptionTest diff --git a/test/javax/management/MBeanServer/MBeanServerNotificationTest.java b/test/javax/management/MBeanServer/MBeanServerNotificationTest.java --- a/test/javax/management/MBeanServer/MBeanServerNotificationTest.java +++ b/test/javax/management/MBeanServer/MBeanServerNotificationTest.java @@ -27,8 +27,9 @@ * @summary Checks that MBeanServerNotification.toString contains the * MBean name. * @author Daniel Fuchs + * * @modules java.management/com.sun.jmx.mbeanserver - * @compile MBeanServerNotificationTest.java + * * @run main MBeanServerNotificationTest */ diff --git a/test/javax/management/MBeanServer/MBeanTest.java b/test/javax/management/MBeanServer/MBeanTest.java --- a/test/javax/management/MBeanServer/MBeanTest.java +++ b/test/javax/management/MBeanServer/MBeanTest.java @@ -31,7 +31,7 @@ * @bug 8010285 * @summary General MBean test. * @author Jaroslav Bachorik - * @modules java.management + * * @run clean MBeanTest * @run build MBeanTest * @run main MBeanTest diff --git a/test/javax/management/MBeanServer/NewMBeanListenerTest.java b/test/javax/management/MBeanServer/NewMBeanListenerTest.java --- a/test/javax/management/MBeanServer/NewMBeanListenerTest.java +++ b/test/javax/management/MBeanServer/NewMBeanListenerTest.java @@ -26,7 +26,7 @@ * @bug 4757273 * @summary Test that registered notification is sent early enough * @author Eamonn McManus - * @modules java.management + * * @run clean NewMBeanListenerTest * @run build NewMBeanListenerTest * @run main NewMBeanListenerTest diff --git a/test/javax/management/MBeanServer/NotifDeadlockTest.java b/test/javax/management/MBeanServer/NotifDeadlockTest.java --- a/test/javax/management/MBeanServer/NotifDeadlockTest.java +++ b/test/javax/management/MBeanServer/NotifDeadlockTest.java @@ -26,7 +26,7 @@ * @bug 4757273 * @summary Test deadlock in MBeanServerDelegate listeners * @author Eamonn McManus - * @modules java.management + * * @run clean NotifDeadlockTest * @run build NotifDeadlockTest * @run main NotifDeadlockTest diff --git a/test/javax/management/MBeanServer/OldMBeanServerTest.java b/test/javax/management/MBeanServer/OldMBeanServerTest.java --- a/test/javax/management/MBeanServer/OldMBeanServerTest.java +++ b/test/javax/management/MBeanServer/OldMBeanServerTest.java @@ -97,7 +97,9 @@ * @bug 5072268 * @summary Test that nothing assumes a post-1.2 MBeanServer * @author Eamonn McManus + * * @modules java.management.rmi + * * @run main/othervm -ea OldMBeanServerTest */ diff --git a/test/javax/management/MBeanServer/PostExceptionTest.java b/test/javax/management/MBeanServer/PostExceptionTest.java --- a/test/javax/management/MBeanServer/PostExceptionTest.java +++ b/test/javax/management/MBeanServer/PostExceptionTest.java @@ -27,8 +27,7 @@ * @summary Check behaviour of MBeanServer when postRegister and postDeregister * throw exceptions. * @author Daniel Fuchs - * @modules java.management - * @compile PostExceptionTest.java + * * @run main PostExceptionTest */ diff --git a/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java b/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java --- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java +++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java @@ -26,7 +26,7 @@ * @bug 6417044 * @summary Test deadlock in MBeanRegistration.postRegister method * @author Eamonn McManus, Daniel Fuchs - * @modules java.management + * * @run clean PostRegisterDeadlockTest * @run build PostRegisterDeadlockTest * @run main PostRegisterDeadlockTest diff --git a/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java b/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java --- a/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java +++ b/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java @@ -26,7 +26,7 @@ * @bug 6417044 * @summary Test that a failing MBean registration does not lead to a deadlock * @author Eamonn McManus - * @modules java.management + * * @run main PostRegisterDeadlockTest2 */ diff --git a/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java b/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java --- a/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java +++ b/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java @@ -26,7 +26,7 @@ * @bug 6318664 * @summary Test deadlock in MBeanRegistration.preDeregister method * @author Eamonn McManus - * @modules java.management + * * @run clean PreDeregisterDeadlockTest * @run build PreDeregisterDeadlockTest * @run main PreDeregisterDeadlockTest diff --git a/test/javax/management/MBeanServer/PreRegisterTest.java b/test/javax/management/MBeanServer/PreRegisterTest.java --- a/test/javax/management/MBeanServer/PreRegisterTest.java +++ b/test/javax/management/MBeanServer/PreRegisterTest.java @@ -26,7 +26,7 @@ * @bug 4911846 * @summary Test that MBeanRegistration can change caller ObjectName * @author Eamonn McManus - * @modules java.management + * * @run clean PreRegisterTest * @run build PreRegisterTest * @run main PreRegisterTest diff --git a/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java b/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java --- a/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java +++ b/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java @@ -27,7 +27,7 @@ * @summary Test that the releaseMBeanServer(MBeanServer mbeanServer) method * throws IllegalArgumentException as expected * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ReleaseMBeanServerTest * @run build ReleaseMBeanServerTest * @run main ReleaseMBeanServerTest diff --git a/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java b/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java --- a/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java +++ b/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java @@ -28,7 +28,7 @@ * IllegalArgumentException when attribute names, operation names, and * Java type names do not strictly follow the expected Java syntax. * @author Daniel Fuchs - * @modules java.management + * * @run clean MustBeValidCommand * @run build MustBeValidCommand * @run main MustBeValidCommand diff --git a/test/javax/management/ObjectInstance/MBeanInfoFailTest.java b/test/javax/management/ObjectInstance/MBeanInfoFailTest.java --- a/test/javax/management/ObjectInstance/MBeanInfoFailTest.java +++ b/test/javax/management/ObjectInstance/MBeanInfoFailTest.java @@ -26,7 +26,7 @@ * @bug 5001857 * @summary Test queryNames() and queryMBeans() with a buggy DynamicMBean * @author Daniel Fuchs - * @modules java.management + * * @run clean MBeanInfoFailTest * @run build MBeanInfoFailTest * @run main MBeanInfoFailTest diff --git a/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java b/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java --- a/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java +++ b/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java @@ -26,7 +26,7 @@ * @bug 5015663 * @summary Test ObjectInstance(name,null).hashCode() and .equals() * @author Daniel Fuchs - * @modules java.management + * * @run clean ObjectInstanceNullTest * @run build ObjectInstanceNullTest * @run main ObjectInstanceNullTest diff --git a/test/javax/management/ObjectInstance/ToStringMethodTest.java b/test/javax/management/ObjectInstance/ToStringMethodTest.java --- a/test/javax/management/ObjectInstance/ToStringMethodTest.java +++ b/test/javax/management/ObjectInstance/ToStringMethodTest.java @@ -26,7 +26,7 @@ * @bug 5080083 * @summary Test new added method "toString" * @author Shanliang JIANG - * @modules java.management + * * @run clean ToStringMethodTest * @run build ToStringMethodTest * @run main ToStringMethodTest diff --git a/test/javax/management/ObjectName/ApplyWildcardTest.java b/test/javax/management/ObjectName/ApplyWildcardTest.java --- a/test/javax/management/ObjectName/ApplyWildcardTest.java +++ b/test/javax/management/ObjectName/ApplyWildcardTest.java @@ -27,7 +27,7 @@ * @summary Test the ObjectName.apply(ObjectName) method * with wildcards in the key properties value part. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ApplyWildcardTest * @run build ApplyWildcardTest * @run main ApplyWildcardTest diff --git a/test/javax/management/ObjectName/ComparatorTest.java b/test/javax/management/ObjectName/ComparatorTest.java --- a/test/javax/management/ObjectName/ComparatorTest.java +++ b/test/javax/management/ObjectName/ComparatorTest.java @@ -26,7 +26,7 @@ * @bug 5036680 * @summary Test the ObjectName.compareTo() method. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ComparatorTest * @run build ComparatorTest * @run main ComparatorTest diff --git a/test/javax/management/ObjectName/CompressedStorageTest.java b/test/javax/management/ObjectName/CompressedStorageTest.java --- a/test/javax/management/ObjectName/CompressedStorageTest.java +++ b/test/javax/management/ObjectName/CompressedStorageTest.java @@ -27,7 +27,9 @@ * @summary Tests the limits imposed on the domain name part of an * ObjectName instance * @author Jaroslav Bachorik + * * @modules java.management/javax.management:open + * * @run main CompressedStorageTest */ diff --git a/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java b/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java --- a/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java +++ b/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java @@ -27,7 +27,7 @@ * @summary Test that MBeanServerDelegate.DELEGATE_NAME and ObjectName.WILDCARD * public constants have been initialized properly. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean DelegateNameWildcardNameTest * @run build DelegateNameWildcardNameTest * @run main DelegateNameWildcardNameTest diff --git a/test/javax/management/ObjectName/NullEmptyKeyValueTest.java b/test/javax/management/ObjectName/NullEmptyKeyValueTest.java --- a/test/javax/management/ObjectName/NullEmptyKeyValueTest.java +++ b/test/javax/management/ObjectName/NullEmptyKeyValueTest.java @@ -26,7 +26,7 @@ * @bug 6229396 * @summary Test null/empty key/values in ObjectName constructors. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean NullEmptyKeyValueTest * @run build NullEmptyKeyValueTest * @run main NullEmptyKeyValueTest diff --git a/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java b/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java --- a/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java +++ b/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java @@ -26,7 +26,7 @@ * @bug 4894801 * @summary Test that ObjectName.getInstance(ObjectName) preserves key order * @author Eamonn McManus - * @modules java.management + * * @run clean ObjectNameGetInstanceTest * @run build ObjectNameGetInstanceTest * @run main ObjectNameGetInstanceTest diff --git a/test/javax/management/ObjectName/RepositoryWildcardTest.java b/test/javax/management/ObjectName/RepositoryWildcardTest.java --- a/test/javax/management/ObjectName/RepositoryWildcardTest.java +++ b/test/javax/management/ObjectName/RepositoryWildcardTest.java @@ -27,7 +27,7 @@ * @summary Test if the repository supports correctly the use of * wildcards in the ObjectName key properties value part. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean RepositoryWildcardTest * @run build RepositoryWildcardTest * @run main RepositoryWildcardTest diff --git a/test/javax/management/ObjectName/SerialCompatTest.java b/test/javax/management/ObjectName/SerialCompatTest.java --- a/test/javax/management/ObjectName/SerialCompatTest.java +++ b/test/javax/management/ObjectName/SerialCompatTest.java @@ -26,7 +26,7 @@ * @bug 6211220 6616825 * @summary Test that jmx.serial.form=1.0 works for ObjectName * @author Eamonn McManus, Daniel Fuchs - * @modules java.management + * * @run clean SerialCompatTest * @run build SerialCompatTest * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true -Djmx.serial.form=1.0 SerialCompatTest diff --git a/test/javax/management/ObjectName/ValueWildcardTest.java b/test/javax/management/ObjectName/ValueWildcardTest.java --- a/test/javax/management/ObjectName/ValueWildcardTest.java +++ b/test/javax/management/ObjectName/ValueWildcardTest.java @@ -26,7 +26,7 @@ * @bug 4716807 * @summary Test wildcards in ObjectName key properties value part. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ValueWildcardTest * @run build ValueWildcardTest * @run main ValueWildcardTest diff --git a/test/javax/management/TEST.properties b/test/javax/management/TEST.properties new file mode 100644 --- /dev/null +++ b/test/javax/management/TEST.properties @@ -0,0 +1,2 @@ +modules = java.management + diff --git a/test/javax/management/descriptor/DefaultDescriptorTest.java b/test/javax/management/descriptor/DefaultDescriptorTest.java --- a/test/javax/management/descriptor/DefaultDescriptorTest.java +++ b/test/javax/management/descriptor/DefaultDescriptorTest.java @@ -26,7 +26,7 @@ * @bug 6204469 * @summary Test that MBean*Info can be constructed with default descriptor * @author Eamonn McManus - * @modules java.management + * * @run clean DefaultDescriptorTest * @run build DefaultDescriptorTest * @run main DefaultDescriptorTest diff --git a/test/javax/management/descriptor/DescriptorTest.java b/test/javax/management/descriptor/DescriptorTest.java --- a/test/javax/management/descriptor/DescriptorTest.java +++ b/test/javax/management/descriptor/DescriptorTest.java @@ -26,7 +26,7 @@ * @bug 6204469 6273765 * @summary Test various aspects of the Descriptor interface * @author Eamonn McManus - * @modules java.management + * * @run clean DescriptorTest * @run build DescriptorTest * @run main DescriptorTest diff --git a/test/javax/management/descriptor/EqualsHashCodeTest.java b/test/javax/management/descriptor/EqualsHashCodeTest.java --- a/test/javax/management/descriptor/EqualsHashCodeTest.java +++ b/test/javax/management/descriptor/EqualsHashCodeTest.java @@ -26,7 +26,7 @@ * @bug 6255956 * @summary Test equals and hashCode for descriptors * @author Eamonn McManus - * @modules java.management + * * @run clean EqualsHashCodeTest * @run build EqualsHashCodeTest * @run main EqualsHashCodeTest diff --git a/test/javax/management/descriptor/ImmutableArrayFieldTest.java b/test/javax/management/descriptor/ImmutableArrayFieldTest.java --- a/test/javax/management/descriptor/ImmutableArrayFieldTest.java +++ b/test/javax/management/descriptor/ImmutableArrayFieldTest.java @@ -27,7 +27,7 @@ * @summary Test that immutability of ImmutableDescriptor cannot be * compromised by modifying field values that are arrays. * @author Eamonn McManus - * @modules java.management + * * @run clean ImmutableArrayFieldTest * @run build ImmutableArrayFieldTest * @run main ImmutableArrayFieldTest diff --git a/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java b/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java --- a/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java +++ b/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java @@ -26,7 +26,7 @@ * @bug 6204469 * @summary Test ImmutableDescriptor serialization. * @author Eamonn McManus - * @modules java.management + * * @run clean ImmutableDescriptorSerialTest * @run build ImmutableDescriptorSerialTest * @run main ImmutableDescriptorSerialTest diff --git a/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java b/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java --- a/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java +++ b/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java @@ -28,7 +28,7 @@ * null name in it and calling setFields with a field names array with an * empty name in it throw the expected exceptions. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ImmutableDescriptorSetFieldsTest * @run build ImmutableDescriptorSetFieldsTest * @run main ImmutableDescriptorSetFieldsTest diff --git a/test/javax/management/descriptor/MBeanInfoInteropTest.java b/test/javax/management/descriptor/MBeanInfoInteropTest.java --- a/test/javax/management/descriptor/MBeanInfoInteropTest.java +++ b/test/javax/management/descriptor/MBeanInfoInteropTest.java @@ -26,7 +26,7 @@ * @bug 6204469 * @summary Check that descriptors have not broken serial interop. * @author Eamonn McManus - * @modules java.management + * * @run clean MBeanInfoInteropTest SerializedInfo * @run build MBeanInfoInteropTest SerializedInfo * @run main MBeanInfoInteropTest SerializedInfo diff --git a/test/javax/management/descriptor/UnionTest.java b/test/javax/management/descriptor/UnionTest.java --- a/test/javax/management/descriptor/UnionTest.java +++ b/test/javax/management/descriptor/UnionTest.java @@ -26,7 +26,7 @@ * @bug 6273752 * @summary Test ImmutableDescriptor.union * @author Eamonn McManus - * @modules java.management + * * @run clean UnionTest * @run build UnionTest * @run main UnionTest diff --git a/test/javax/management/generified/GenericTest.java b/test/javax/management/generified/GenericTest.java --- a/test/javax/management/generified/GenericTest.java +++ b/test/javax/management/generified/GenericTest.java @@ -26,7 +26,7 @@ * @bug 4847959 6191402 * @summary Test newly-generified APIs * @author Eamonn McManus - * @modules java.management + * * @run clean GenericTest * @run build GenericTest * @run main GenericTest diff --git a/test/javax/management/generified/ListTypeCheckTest.java b/test/javax/management/generified/ListTypeCheckTest.java --- a/test/javax/management/generified/ListTypeCheckTest.java +++ b/test/javax/management/generified/ListTypeCheckTest.java @@ -26,7 +26,7 @@ * @bug 6250772 * @summary Test that *List objects are checked after asList is called. * @author Eamonn McManus - * @modules java.management + * * @run clean ListTypeCheckTest * @run build ListTypeCheckTest * @run main ListTypeCheckTest diff --git a/test/javax/management/loading/ArrayClassTest.java b/test/javax/management/loading/ArrayClassTest.java --- a/test/javax/management/loading/ArrayClassTest.java +++ b/test/javax/management/loading/ArrayClassTest.java @@ -27,7 +27,7 @@ * @summary Test that array classes can be found in signatures always * and can be deserialized by the deprecated MBeanServer.deserialize method * @author Eamonn McManus - * @modules java.management + * * @run clean ArrayClassTest * @run build ArrayClassTest * @run main ArrayClassTest diff --git a/test/javax/management/loading/DocumentRootTest.java b/test/javax/management/loading/DocumentRootTest.java --- a/test/javax/management/loading/DocumentRootTest.java +++ b/test/javax/management/loading/DocumentRootTest.java @@ -27,7 +27,7 @@ * @summary Test parsing error when the mlet file is * located in the web server's document root. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean DocumentRootTest * @run build DocumentRootTest * @run main DocumentRootTest diff --git a/test/javax/management/loading/GetMBeansFromURLTest.java b/test/javax/management/loading/GetMBeansFromURLTest.java --- a/test/javax/management/loading/GetMBeansFromURLTest.java +++ b/test/javax/management/loading/GetMBeansFromURLTest.java @@ -28,7 +28,7 @@ * given MLet instance throws a ServiceNotFoundException exception * with a non null cause. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean GetMBeansFromURLTest * @run build GetMBeansFromURLTest * @run main GetMBeansFromURLTest diff --git a/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java b/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java --- a/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java +++ b/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java @@ -27,7 +27,7 @@ * @summary Test that the same native library coming from the same jar file can * be loaded twice by two different MLets on the same JVM without conflict. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean LibraryLoaderTest * @run build LibraryLoaderTest * @run main/othervm LibraryLoaderTest diff --git a/test/javax/management/loading/MLetCLR/MLetCommand.java b/test/javax/management/loading/MLetCLR/MLetCommand.java --- a/test/javax/management/loading/MLetCLR/MLetCommand.java +++ b/test/javax/management/loading/MLetCLR/MLetCommand.java @@ -28,7 +28,7 @@ * for the test codebase as it is executed by the MLet code using * doPrivileged. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean MLetCommand * @run build MLetCommand * @run main/othervm/java.security.policy=policy MLetCommand diff --git a/test/javax/management/loading/MLetContentTest.java b/test/javax/management/loading/MLetContentTest.java --- a/test/javax/management/loading/MLetContentTest.java +++ b/test/javax/management/loading/MLetContentTest.java @@ -26,7 +26,7 @@ * @bug 4796780 * @summary The class MLetContentTest becomes public * @author Shanliang JIANG - * @modules java.management + * * @run clean MLetContentTest * @run build MLetContentTest * @run main MLetContentTest diff --git a/test/javax/management/loading/MLetInternalsTest.java b/test/javax/management/loading/MLetInternalsTest.java --- a/test/javax/management/loading/MLetInternalsTest.java +++ b/test/javax/management/loading/MLetInternalsTest.java @@ -36,7 +36,9 @@ * @bug 8058089 * @summary Tests various internal functions provided by MLet for correctness * @author Jaroslav Bachorik + * * @modules java.management/javax.management.loading:open + * * @run testng MLetInternalsTest */ public class MLetInternalsTest { diff --git a/test/javax/management/loading/MletParserLocaleTest.java b/test/javax/management/loading/MletParserLocaleTest.java --- a/test/javax/management/loading/MletParserLocaleTest.java +++ b/test/javax/management/loading/MletParserLocaleTest.java @@ -26,7 +26,7 @@ * @bug 7065236 * @summary Checking MletParser for Locale insensitive strings * @author Harsha Wardhana B - * @modules java.management + * * @run clean MletParserLocaleTest * @run build MletParserLocaleTest * @run main/othervm/timeout=5 MletParserLocaleTest mlet4.html diff --git a/test/javax/management/loading/ParserInfiniteLoopTest.java b/test/javax/management/loading/ParserInfiniteLoopTest.java --- a/test/javax/management/loading/ParserInfiniteLoopTest.java +++ b/test/javax/management/loading/ParserInfiniteLoopTest.java @@ -29,7 +29,7 @@ * terminated with the corresponding '>' and an opening '<' for * the subsequent tag is encountered. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ParserInfiniteLoopTest * @run build ParserInfiniteLoopTest * @run main/othervm/timeout=5 ParserInfiniteLoopTest mlet1.html diff --git a/test/javax/management/loading/SystemClassLoaderTest.java b/test/javax/management/loading/SystemClassLoaderTest.java --- a/test/javax/management/loading/SystemClassLoaderTest.java +++ b/test/javax/management/loading/SystemClassLoaderTest.java @@ -27,7 +27,7 @@ * @summary Test that a class can load MBeans from its class loader * (at least if it is the system class loader) * @author Eamonn McManus - * @modules java.management + * * @run clean SystemClassLoaderTest * @run build SystemClassLoaderTest * @run main SystemClassLoaderTest diff --git a/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java b/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java --- a/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java +++ b/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java @@ -30,7 +30,7 @@ * no other attributes. * @author Yves Joan * @author Eamonn McManus - * @modules java.management + * * @run clean AddAttributeChangeNotificationListenerTest * @run build AddAttributeChangeNotificationListenerTest * @run main AddAttributeChangeNotificationListenerTest diff --git a/test/javax/management/modelmbean/DescriptorSupportSerialTest.java b/test/javax/management/modelmbean/DescriptorSupportSerialTest.java --- a/test/javax/management/modelmbean/DescriptorSupportSerialTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportSerialTest.java @@ -26,7 +26,7 @@ * @bug 6332962 * @summary Test that DescriptorSupport does not serialize targetObject * @author Eamonn McManus - * @modules java.management + * * @run clean DescriptorSupportSerialTest * @run build DescriptorSupportSerialTest * @run main DescriptorSupportSerialTest diff --git a/test/javax/management/modelmbean/DescriptorSupportTest.java b/test/javax/management/modelmbean/DescriptorSupportTest.java --- a/test/javax/management/modelmbean/DescriptorSupportTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportTest.java @@ -26,7 +26,7 @@ * @bug 4883712 4869006 4894856 5016685 * @summary Test that DescriptorSupport correctly validates fields * @author Eamonn McManus - * @modules java.management + * * @run clean DescriptorSupportTest * @run build DescriptorSupportTest * @run main DescriptorSupportTest diff --git a/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java b/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java --- a/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java @@ -26,7 +26,7 @@ * @bug 7065236 * @summary Test for locale insensitive strings in DescriptorSupport class * @author Harsha Wardhana B - * @modules java.management + * * @run clean DescriptorSupportXMLLocaleTest * @run build DescriptorSupportXMLLocaleTest * @run main DescriptorSupportXMLLocaleTest diff --git a/test/javax/management/modelmbean/DescriptorSupportXMLTest.java b/test/javax/management/modelmbean/DescriptorSupportXMLTest.java --- a/test/javax/management/modelmbean/DescriptorSupportXMLTest.java +++ b/test/javax/management/modelmbean/DescriptorSupportXMLTest.java @@ -27,7 +27,7 @@ * @summary Test that DescriptorSupport.toXMLString() can be used to * reconstruct an equivalent DescriptorSupport * @author Eamonn McManus - * @modules java.management + * * @run clean DescriptorSupportXMLTest * @run build DescriptorSupportXMLTest * @run main DescriptorSupportXMLTest diff --git a/test/javax/management/modelmbean/ExoticTargetTypeTest.java b/test/javax/management/modelmbean/ExoticTargetTypeTest.java --- a/test/javax/management/modelmbean/ExoticTargetTypeTest.java +++ b/test/javax/management/modelmbean/ExoticTargetTypeTest.java @@ -27,7 +27,7 @@ * @summary Test that a custom ModelMBean implementation can have custom * targetType values in its ModelMBeanOperationInfo descriptors. * @author Eamonn McManus - * @modules java.management + * * @run clean ExoticTargetTypeTest * @run build ExoticTargetTypeTest * @run main ExoticTargetTypeTest diff --git a/test/javax/management/modelmbean/InfoSupportTest.java b/test/javax/management/modelmbean/InfoSupportTest.java --- a/test/javax/management/modelmbean/InfoSupportTest.java +++ b/test/javax/management/modelmbean/InfoSupportTest.java @@ -29,7 +29,7 @@ * that getDescriptors("mbean") works, and that default values for * MBean descriptors are correctly assigned. * @author Eamonn McManus - * @modules java.management + * * @run clean InfoSupportTest * @run build InfoSupportTest * @run main InfoSupportTest diff --git a/test/javax/management/modelmbean/LoggingExceptionTest.java b/test/javax/management/modelmbean/LoggingExceptionTest.java --- a/test/javax/management/modelmbean/LoggingExceptionTest.java +++ b/test/javax/management/modelmbean/LoggingExceptionTest.java @@ -29,7 +29,6 @@ * when traces enabled and no attributes. * @author Luis-Miguel Alventosa * @author Paul Cheeseman - * @modules java.management */ import java.util.logging.ConsoleHandler; diff --git a/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java b/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java --- a/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java +++ b/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java @@ -27,7 +27,7 @@ * @summary Test that ModelMBeanInfoSupport.getDescriptors(null) also * returns the MBean's descriptor. * @author Eamonn McManus, Daniel Fuchs - * @modules java.management + * * @run clean GetAllDescriptorsTest * @run build GetAllDescriptorsTest * @run main/othervm/java.security.policy=policy GetAllDescriptorsTest diff --git a/test/javax/management/modelmbean/OnUnregisterTest.java b/test/javax/management/modelmbean/OnUnregisterTest.java --- a/test/javax/management/modelmbean/OnUnregisterTest.java +++ b/test/javax/management/modelmbean/OnUnregisterTest.java @@ -27,7 +27,7 @@ * @summary Check that OnUnregister is an allowed value for persistPolicy * in ModelMBeanAttributeInfo * @author Eamonn McManus - * @modules java.management + * * @run clean OnUnregisterTest * @run build OnUnregisterTest * @run main OnUnregisterTest diff --git a/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java b/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java @@ -36,7 +36,7 @@ * - the declared name can be loaded by the value's class loader and * produces a class to which the value can be assigned. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean RequiredModelMBeanGetAttributeTest * @run build RequiredModelMBeanGetAttributeTest * @run main RequiredModelMBeanGetAttributeTest diff --git a/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java b/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java @@ -28,7 +28,7 @@ * from the RequiredModelMBean class itself if they are not in the * ModelMBeanInfo * @author Eamonn McManus - * @modules java.management + * * @run clean RequiredModelMBeanMethodTest * @run build RequiredModelMBeanMethodTest * @run main RequiredModelMBeanMethodTest diff --git a/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java b/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java --- a/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java +++ b/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java @@ -28,7 +28,7 @@ * MBeanException wrapping a ServiceNotFoundException is thrown is setAttribute * called but no setMethod field has been provided. * @author Jean-Francois Denise - * @modules java.management + * * @run clean RequiredModelMBeanSetAttributeTest * @run build RequiredModelMBeanSetAttributeTest * @run main RequiredModelMBeanSetAttributeTest diff --git a/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java b/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java --- a/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java +++ b/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java @@ -28,7 +28,7 @@ * IllegalArgumentException when attribute names, operation names, and * Java type names do not strictly follow the expected Java syntax. * @author Eamonn McManus, Daniel Fuchs - * @modules java.management + * * @run clean SimpleModelMBeanCommand * @run build SimpleModelMBeanCommand * @run main/othervm/java.security.policy=policy SimpleModelMBeanCommand diff --git a/test/javax/management/modelmbean/UnserializableTargetObjectTest.java b/test/javax/management/modelmbean/UnserializableTargetObjectTest.java --- a/test/javax/management/modelmbean/UnserializableTargetObjectTest.java +++ b/test/javax/management/modelmbean/UnserializableTargetObjectTest.java @@ -27,7 +27,9 @@ * @summary Test that a RequiredModelMBean operation can have a targetObject * that is not serializable * @author Eamonn McManus + * * @modules java.management.rmi + * * @run clean UnserializableTargetObjectTest * @run build UnserializableTargetObjectTest * @run main UnserializableTargetObjectTest diff --git a/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java b/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java --- a/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java +++ b/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java @@ -27,8 +27,10 @@ * @summary Test that the counter/gauge/string monitors * support attributes of arbitrary data types. * @author Luis-Miguel Alventosa + * * @modules java.desktop * java.management + * * @run clean AttributeArbitraryDataTypeTest * @run build AttributeArbitraryDataTypeTest * @run main AttributeArbitraryDataTypeTest diff --git a/test/javax/management/monitor/CounterMonitorDeadlockTest.java b/test/javax/management/monitor/CounterMonitorDeadlockTest.java --- a/test/javax/management/monitor/CounterMonitorDeadlockTest.java +++ b/test/javax/management/monitor/CounterMonitorDeadlockTest.java @@ -27,7 +27,7 @@ * @summary Test that no locks are held when a monitor attribute is sampled * or notif delivered. * @author Eamonn McManus - * @modules java.management + * * @run clean CounterMonitorDeadlockTest * @run build CounterMonitorDeadlockTest * @run main CounterMonitorDeadlockTest 1 diff --git a/test/javax/management/monitor/CounterMonitorInitThresholdTest.java b/test/javax/management/monitor/CounterMonitorInitThresholdTest.java --- a/test/javax/management/monitor/CounterMonitorInitThresholdTest.java +++ b/test/javax/management/monitor/CounterMonitorInitThresholdTest.java @@ -28,7 +28,7 @@ * objects added before the counter monitor is started as well as by * the observed objects which are added once the monitor is started. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean CounterMonitorInitThresholdTest * @run build CounterMonitorInitThresholdTest * @run main CounterMonitorInitThresholdTest diff --git a/test/javax/management/monitor/CounterMonitorTest.java b/test/javax/management/monitor/CounterMonitorTest.java --- a/test/javax/management/monitor/CounterMonitorTest.java +++ b/test/javax/management/monitor/CounterMonitorTest.java @@ -27,7 +27,7 @@ * @summary Test that the counter monitor, when running in difference mode, * emits a notification every time the threshold is exceeded. * @author Luis-Miguel Alventosa, Shanliang JIANG - * @modules java.management + * * @run clean CounterMonitorTest * @run build CounterMonitorTest * @run main CounterMonitorTest diff --git a/test/javax/management/monitor/CounterMonitorThresholdTest.java b/test/javax/management/monitor/CounterMonitorThresholdTest.java --- a/test/javax/management/monitor/CounterMonitorThresholdTest.java +++ b/test/javax/management/monitor/CounterMonitorThresholdTest.java @@ -26,7 +26,7 @@ * @bug 6229368 8025207 * @summary Wrong threshold value in CounterMonitor with offset and modulus. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean CounterMonitorThresholdTest * @run build CounterMonitorThresholdTest * @run main CounterMonitorThresholdTest diff --git a/test/javax/management/monitor/DerivedGaugeMonitorTest.java b/test/javax/management/monitor/DerivedGaugeMonitorTest.java --- a/test/javax/management/monitor/DerivedGaugeMonitorTest.java +++ b/test/javax/management/monitor/DerivedGaugeMonitorTest.java @@ -26,7 +26,7 @@ * @bug 6683213 * @summary Test that the initial derived gauge is (Integer)0 * @author Daniel Fuchs - * @modules java.management + * * @run clean DerivedGaugeMonitorTest * @run build DerivedGaugeMonitorTest * @run main DerivedGaugeMonitorTest diff --git a/test/javax/management/monitor/GaugeMonitorDeadlockTest.java b/test/javax/management/monitor/GaugeMonitorDeadlockTest.java --- a/test/javax/management/monitor/GaugeMonitorDeadlockTest.java +++ b/test/javax/management/monitor/GaugeMonitorDeadlockTest.java @@ -27,8 +27,9 @@ * @summary Test that no locks are held when a monitor attribute is sampled * or notif delivered. * @author Eamonn McManus + * * @library /lib/testlibrary - * @modules java.management + * * @run clean GaugeMonitorDeadlockTest * @run build GaugeMonitorDeadlockTest * @run main GaugeMonitorDeadlockTest 1 diff --git a/test/javax/management/monitor/MultiMonitorTest.java b/test/javax/management/monitor/MultiMonitorTest.java --- a/test/javax/management/monitor/MultiMonitorTest.java +++ b/test/javax/management/monitor/MultiMonitorTest.java @@ -24,13 +24,13 @@ /* * @test * @bug 4984057 + * @key randomness * @summary Test that monitors can sample a large number of attributes * @author Eamonn McManus - * @modules java.management + * * @run clean MultiMonitorTest * @run build MultiMonitorTest * @run main MultiMonitorTest - * @key randomness */ import java.util.*; diff --git a/test/javax/management/monitor/NonComparableAttributeValueTest.java b/test/javax/management/monitor/NonComparableAttributeValueTest.java --- a/test/javax/management/monitor/NonComparableAttributeValueTest.java +++ b/test/javax/management/monitor/NonComparableAttributeValueTest.java @@ -28,7 +28,7 @@ * jmx.monitor.error.type notification when the attribute * being monitored returns a non comparable value. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean NonComparableAttributeValueTest * @run build NonComparableAttributeValueTest * @run main NonComparableAttributeValueTest diff --git a/test/javax/management/monitor/NullAttributeValueTest.java b/test/javax/management/monitor/NullAttributeValueTest.java --- a/test/javax/management/monitor/NullAttributeValueTest.java +++ b/test/javax/management/monitor/NullAttributeValueTest.java @@ -29,7 +29,7 @@ * being monitored returns a null value. * @author Luis-Miguel Alventosa * @author Shanliang JIANG - * @modules java.management + * * @run clean NullAttributeValueTest * @run build NullAttributeValueTest * @run main NullAttributeValueTest diff --git a/test/javax/management/monitor/ReflectionExceptionTest.java b/test/javax/management/monitor/ReflectionExceptionTest.java --- a/test/javax/management/monitor/ReflectionExceptionTest.java +++ b/test/javax/management/monitor/ReflectionExceptionTest.java @@ -24,11 +24,11 @@ /* * @test * @bug 6205072 + * @key intermittent * @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 * @run build ReflectionExceptionTest MBeanServerBuilderImpl diff --git a/test/javax/management/monitor/RuntimeExceptionTest.java b/test/javax/management/monitor/RuntimeExceptionTest.java --- a/test/javax/management/monitor/RuntimeExceptionTest.java +++ b/test/javax/management/monitor/RuntimeExceptionTest.java @@ -27,7 +27,7 @@ * @summary Test that the jmx.monitor.error.runtime monitor notification * is emitted when getAttribute throws RuntimeException. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean RuntimeExceptionTest MBeanServerBuilderImpl * MBeanServerForwarderInvocationHandler * @run build RuntimeExceptionTest MBeanServerBuilderImpl diff --git a/test/javax/management/monitor/StartStopTest.java b/test/javax/management/monitor/StartStopTest.java --- a/test/javax/management/monitor/StartStopTest.java +++ b/test/javax/management/monitor/StartStopTest.java @@ -27,8 +27,9 @@ * @summary Test that tasks are cancelled properly when * monitors are started and stopped in a loop. * @author Luis-Miguel Alventosa + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* * @run clean StartStopTest * @run build StartStopTest diff --git a/test/javax/management/monitor/StringMonitorDeadlockTest.java b/test/javax/management/monitor/StringMonitorDeadlockTest.java --- a/test/javax/management/monitor/StringMonitorDeadlockTest.java +++ b/test/javax/management/monitor/StringMonitorDeadlockTest.java @@ -24,11 +24,11 @@ /* * @test * @bug 6303187 + * @key intermittent * @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 * @run main StringMonitorDeadlockTest 1 diff --git a/test/javax/management/monitor/ThreadPoolAccTest.java b/test/javax/management/monitor/ThreadPoolAccTest.java --- a/test/javax/management/monitor/ThreadPoolAccTest.java +++ b/test/javax/management/monitor/ThreadPoolAccTest.java @@ -27,7 +27,7 @@ * @summary Test that each thread in the thread pool runs * in the context of the monitor.start() caller. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ThreadPoolAccTest * @run build ThreadPoolAccTest * @run main ThreadPoolAccTest diff --git a/test/javax/management/monitor/ThreadPoolTest.java b/test/javax/management/monitor/ThreadPoolTest.java --- a/test/javax/management/monitor/ThreadPoolTest.java +++ b/test/javax/management/monitor/ThreadPoolTest.java @@ -27,7 +27,7 @@ * @summary Test that all monitors will be well started when sharing * a single thread pool. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ThreadPoolTest * @run build ThreadPoolTest * @run main/othervm/timeout=300 ThreadPoolTest 1 diff --git a/test/javax/management/mxbean/AmbiguousConstructorTest.java b/test/javax/management/mxbean/AmbiguousConstructorTest.java --- a/test/javax/management/mxbean/AmbiguousConstructorTest.java +++ b/test/javax/management/mxbean/AmbiguousConstructorTest.java @@ -26,7 +26,7 @@ * @bug 6175517 6278707 * @summary Test that ambiguous ConstructorProperties annotations are detected. * @author Eamonn McManus - * @modules java.management + * * @run clean AmbiguousConstructorTest * @run build AmbiguousConstructorTest * @run main AmbiguousConstructorTest diff --git a/test/javax/management/mxbean/ComparatorExceptionTest.java b/test/javax/management/mxbean/ComparatorExceptionTest.java --- a/test/javax/management/mxbean/ComparatorExceptionTest.java +++ b/test/javax/management/mxbean/ComparatorExceptionTest.java @@ -26,7 +26,6 @@ * @bug 6601652 * @summary Test exception when SortedMap or SortedSet has non-null Comparator * @author Eamonn McManus - * @modules java.management */ import java.util.SortedMap; diff --git a/test/javax/management/mxbean/ExceptionDiagnosisTest.java b/test/javax/management/mxbean/ExceptionDiagnosisTest.java --- a/test/javax/management/mxbean/ExceptionDiagnosisTest.java +++ b/test/javax/management/mxbean/ExceptionDiagnosisTest.java @@ -26,7 +26,6 @@ * @bug 6713777 * @summary Test that exception messages include all relevant information * @author Eamonn McManus - * @modules java.management */ import javax.management.ConstructorParameters; diff --git a/test/javax/management/mxbean/GenericArrayTypeTest.java b/test/javax/management/mxbean/GenericArrayTypeTest.java --- a/test/javax/management/mxbean/GenericArrayTypeTest.java +++ b/test/javax/management/mxbean/GenericArrayTypeTest.java @@ -24,10 +24,12 @@ /* * @test * @bug 6292705 + * @key intermittent * @summary Test support for arrays in parameterized types. * @author Luis-Miguel Alventosa - * @key intermittent + * * @modules java.management.rmi + * * @run clean GenericArrayTypeTest * @run build GenericArrayTypeTest * @run main GenericArrayTypeTest diff --git a/test/javax/management/mxbean/GenericTypeTest.java b/test/javax/management/mxbean/GenericTypeTest.java --- a/test/javax/management/mxbean/GenericTypeTest.java +++ b/test/javax/management/mxbean/GenericTypeTest.java @@ -26,7 +26,7 @@ * @bug 6376416 6406447 * @summary Test use of generic types in MXBeans (mostly illegal). * @author Eamonn McManus - * @modules java.management + * * @run main GenericTypeTest */ diff --git a/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java b/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java --- a/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java +++ b/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java @@ -27,7 +27,7 @@ * @summary Ensure the registration of an invalid MXBean * throws NotCompliantMBeanException. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean InvalidMXBeanRegistrationTest * @run build InvalidMXBeanRegistrationTest * @run main InvalidMXBeanRegistrationTest diff --git a/test/javax/management/mxbean/LeakTest.java b/test/javax/management/mxbean/LeakTest.java --- a/test/javax/management/mxbean/LeakTest.java +++ b/test/javax/management/mxbean/LeakTest.java @@ -25,7 +25,7 @@ * @bug 6482247 * @summary Test that creating MXBeans does not introduce memory leaks. * @author Eamonn McManus - * @modules java.management + * * @run build LeakTest RandomMXBeanTest MerlinMXBean TigerMXBean * @run main LeakTest */ diff --git a/test/javax/management/mxbean/MBeanOperationInfoTest.java b/test/javax/management/mxbean/MBeanOperationInfoTest.java --- a/test/javax/management/mxbean/MBeanOperationInfoTest.java +++ b/test/javax/management/mxbean/MBeanOperationInfoTest.java @@ -26,7 +26,7 @@ * @bug 6359948 * @summary Check that MXBean operations have the expected ReturnType in MBeanOperationInfo * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean MBeanOperationInfoTest * @run build MBeanOperationInfoTest * @run main MBeanOperationInfoTest diff --git a/test/javax/management/mxbean/MXBeanAnnotationTest.java b/test/javax/management/mxbean/MXBeanAnnotationTest.java --- a/test/javax/management/mxbean/MXBeanAnnotationTest.java +++ b/test/javax/management/mxbean/MXBeanAnnotationTest.java @@ -26,7 +26,7 @@ * @bug 6316491 * @summary Check that the MXBean annotation works as advertised * @author Eamonn McManus - * @modules java.management + * * @run clean MXBeanAnnotationTest * @run build MXBeanAnnotationTest * @run main MXBeanAnnotationTest diff --git a/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java b/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java --- a/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java +++ b/test/javax/management/mxbean/MXBeanExceptionHandlingTest.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Checks correct exception and error events from NotificationListener * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile Basic.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanExceptionHandlingTest -timeForNotificationInSeconds 3 */ diff --git a/test/javax/management/mxbean/MXBeanFallbackTest.java b/test/javax/management/mxbean/MXBeanFallbackTest.java --- a/test/javax/management/mxbean/MXBeanFallbackTest.java +++ b/test/javax/management/mxbean/MXBeanFallbackTest.java @@ -28,7 +28,7 @@ * It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic" * system property must be set before c.s.j.m.MBeanAnalyzer has been loaded. * @author Jaroslav Bachorik - * @modules java.management + * * @run clean MXBeanFallbackTest * @run build MXBeanFallbackTest * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true MXBeanFallbackTest diff --git a/test/javax/management/mxbean/MXBeanFlagTest.java b/test/javax/management/mxbean/MXBeanFlagTest.java --- a/test/javax/management/mxbean/MXBeanFlagTest.java +++ b/test/javax/management/mxbean/MXBeanFlagTest.java @@ -26,7 +26,7 @@ * @bug 6335337 * @summary Test correctness of mxbean flag in descriptor. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean MXBeanFlagTest * @run build MXBeanFlagTest * @run main MXBeanFlagTest diff --git a/test/javax/management/mxbean/MXBeanInteropTest1.java b/test/javax/management/mxbean/MXBeanInteropTest1.java --- a/test/javax/management/mxbean/MXBeanInteropTest1.java +++ b/test/javax/management/mxbean/MXBeanInteropTest1.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Test all MXBeans available by default on the platform * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanInteropTest1 */ diff --git a/test/javax/management/mxbean/MXBeanInteropTest2.java b/test/javax/management/mxbean/MXBeanInteropTest2.java --- a/test/javax/management/mxbean/MXBeanInteropTest2.java +++ b/test/javax/management/mxbean/MXBeanInteropTest2.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Checks access to test MXBean * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile Basic.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanInteropTest2 */ diff --git a/test/javax/management/mxbean/MXBeanLoadingTest1.java b/test/javax/management/mxbean/MXBeanLoadingTest1.java --- a/test/javax/management/mxbean/MXBeanLoadingTest1.java +++ b/test/javax/management/mxbean/MXBeanLoadingTest1.java @@ -26,8 +26,9 @@ * @bug 8058865 * @summary Checks correct collection of MXBean's class after unregistration * @author Olivier Lagneau - * @modules java.management + * * @library /lib/testlibrary + * * @run main/othervm/timeout=300 MXBeanLoadingTest1 */ diff --git a/test/javax/management/mxbean/MXBeanNotifTest.java b/test/javax/management/mxbean/MXBeanNotifTest.java --- a/test/javax/management/mxbean/MXBeanNotifTest.java +++ b/test/javax/management/mxbean/MXBeanNotifTest.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Checks MXBean proper registration both as its implementation class and interface * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile Basic.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanNotifTest -numOfNotifications 239 -timeForNotificationInSeconds 4 */ diff --git a/test/javax/management/mxbean/MXBeanPreRegisterTest.java b/test/javax/management/mxbean/MXBeanPreRegisterTest.java --- a/test/javax/management/mxbean/MXBeanPreRegisterTest.java +++ b/test/javax/management/mxbean/MXBeanPreRegisterTest.java @@ -27,7 +27,7 @@ * @summary Ensure that preRegister etc are called, but not when wrapped * by the class StandardMBean * @author Eamonn McManus - * @modules java.management + * * @run clean MXBeanPreRegisterTest * @run build MXBeanPreRegisterTest * @run main MXBeanPreRegisterTest diff --git a/test/javax/management/mxbean/MXBeanRefTest.java b/test/javax/management/mxbean/MXBeanRefTest.java --- a/test/javax/management/mxbean/MXBeanRefTest.java +++ b/test/javax/management/mxbean/MXBeanRefTest.java @@ -26,7 +26,7 @@ * @bug 6296433 6283873 * @summary Test that inter-MXBean references work as expected. * @author Eamonn McManus - * @modules java.management + * * @run clean MXBeanRefTest * @run build MXBeanRefTest * @run main MXBeanRefTest diff --git a/test/javax/management/mxbean/MXBeanTest.java b/test/javax/management/mxbean/MXBeanTest.java --- a/test/javax/management/mxbean/MXBeanTest.java +++ b/test/javax/management/mxbean/MXBeanTest.java @@ -27,7 +27,9 @@ * @summary General MXBean test. * @author Eamonn McManus * @author Jaroslav Bachorik + * * @modules java.management.rmi + * * @run clean MXBeanTest MerlinMXBean TigerMXBean * @run build MXBeanTest MerlinMXBean TigerMXBean * @run main MXBeanTest diff --git a/test/javax/management/mxbean/MXBeanWeirdParamTest.java b/test/javax/management/mxbean/MXBeanWeirdParamTest.java --- a/test/javax/management/mxbean/MXBeanWeirdParamTest.java +++ b/test/javax/management/mxbean/MXBeanWeirdParamTest.java @@ -27,8 +27,10 @@ * @summary Checks that a serialized instance is not transmitted from an MXBean. * All the communication should be done via Open Types * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile Basic.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD MXBeanWeirdParamTest */ diff --git a/test/javax/management/mxbean/MiscTest.java b/test/javax/management/mxbean/MiscTest.java --- a/test/javax/management/mxbean/MiscTest.java +++ b/test/javax/management/mxbean/MiscTest.java @@ -28,7 +28,7 @@ * interfaceClassName, openType, originalType, StandardMBean, * StandardEmitterMBean. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean MiscTest * @run build MiscTest * @run main MiscTest diff --git a/test/javax/management/mxbean/OperationImpactTest.java b/test/javax/management/mxbean/OperationImpactTest.java --- a/test/javax/management/mxbean/OperationImpactTest.java +++ b/test/javax/management/mxbean/OperationImpactTest.java @@ -26,7 +26,7 @@ * @bug 6320104 * @summary Check that MXBean operations have impact UNKNOWN. * @author Eamonn McManus - * @modules java.management + * * @run clean OperationImpactTest * @run build OperationImpactTest * @run main OperationImpactTest diff --git a/test/javax/management/mxbean/OverloadTest.java b/test/javax/management/mxbean/OverloadTest.java --- a/test/javax/management/mxbean/OverloadTest.java +++ b/test/javax/management/mxbean/OverloadTest.java @@ -26,7 +26,7 @@ * @bug 6175517 * @summary Test that MXBean interfaces can contain overloaded methods * @author Eamonn McManus - * @modules java.management + * * @run clean OverloadTest * @run build OverloadTest * @run main OverloadTest diff --git a/test/javax/management/mxbean/PreRegisterNameTest.java b/test/javax/management/mxbean/PreRegisterNameTest.java --- a/test/javax/management/mxbean/PreRegisterNameTest.java +++ b/test/javax/management/mxbean/PreRegisterNameTest.java @@ -26,7 +26,6 @@ * @bug 6448042 * @summary Test that MXBeans can define their own names in preRegister * @author Eamonn McManus - * @modules java.management */ import java.lang.management.ManagementFactory; diff --git a/test/javax/management/mxbean/PropertyNamesTest.java b/test/javax/management/mxbean/PropertyNamesTest.java --- a/test/javax/management/mxbean/PropertyNamesTest.java +++ b/test/javax/management/mxbean/PropertyNamesTest.java @@ -26,7 +26,7 @@ * @bug 6175517 * @summary Test the PropertyNames annotation with MXBeans * @author Eamonn McManus - * @modules java.management + * * @run clean PropertyNamesTest * @run build PropertyNamesTest * @run main PropertyNamesTest diff --git a/test/javax/management/mxbean/SameObjectTwoNamesTest.java b/test/javax/management/mxbean/SameObjectTwoNamesTest.java --- a/test/javax/management/mxbean/SameObjectTwoNamesTest.java +++ b/test/javax/management/mxbean/SameObjectTwoNamesTest.java @@ -28,7 +28,7 @@ * names produces an exception * @author Alexander Shusherov * @author Eamonn McManus - * @modules java.management + * * @run main SameObjectTwoNamesTest * @run main/othervm -Djmx.mxbean.multiname=true SameObjectTwoNamesTest */ diff --git a/test/javax/management/mxbean/StandardMBeanOverrideTest.java b/test/javax/management/mxbean/StandardMBeanOverrideTest.java --- a/test/javax/management/mxbean/StandardMBeanOverrideTest.java +++ b/test/javax/management/mxbean/StandardMBeanOverrideTest.java @@ -29,7 +29,7 @@ * getMBeanInfo and getNotificationInfo in StandardMBean and * StandardEmitterMBean. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean StandardMBeanOverrideTest * @run build StandardMBeanOverrideTest * @run main StandardMBeanOverrideTest diff --git a/test/javax/management/mxbean/ThreadMXBeanTest.java b/test/javax/management/mxbean/ThreadMXBeanTest.java --- a/test/javax/management/mxbean/ThreadMXBeanTest.java +++ b/test/javax/management/mxbean/ThreadMXBeanTest.java @@ -24,13 +24,13 @@ /* * @test * @bug 6305746 + * @key randomness * @summary Test that the null values returned by the ThreadMXBean work. * @author Eamonn McManus - * @modules java.management + * * @run clean ThreadMXBeanTest * @run build ThreadMXBeanTest * @run main ThreadMXBeanTest - * @key randomness */ import java.lang.management.*; diff --git a/test/javax/management/mxbean/TypeNameTest.java b/test/javax/management/mxbean/TypeNameTest.java --- a/test/javax/management/mxbean/TypeNameTest.java +++ b/test/javax/management/mxbean/TypeNameTest.java @@ -26,7 +26,6 @@ * @bug 6757225 6763051 * @summary Test that type names in MXBeans match their spec. * @author Eamonn McManus - * @modules java.management */ import java.lang.reflect.Field; diff --git a/test/javax/management/notification/BroadcasterSupportDeadlockTest.java b/test/javax/management/notification/BroadcasterSupportDeadlockTest.java --- a/test/javax/management/notification/BroadcasterSupportDeadlockTest.java +++ b/test/javax/management/notification/BroadcasterSupportDeadlockTest.java @@ -27,7 +27,7 @@ * @summary Test that NotificationBroadcasterSupport can be subclassed * and used with synchronized(this) without causing deadlock * @author Eamonn McManus - * @modules java.management + * * @run clean BroadcasterSupportDeadlockTest * @run build BroadcasterSupportDeadlockTest * @run main BroadcasterSupportDeadlockTest diff --git a/test/javax/management/notification/FilterExceptionTest.java b/test/javax/management/notification/FilterExceptionTest.java --- a/test/javax/management/notification/FilterExceptionTest.java +++ b/test/javax/management/notification/FilterExceptionTest.java @@ -26,7 +26,7 @@ * @bug 6244855 6244863 * @summary Exception thrown by NotificationFilter should be ignored * @author Shanliang JIANG - * @modules java.management + * * @run clean FilterExceptionTest * @run build FilterExceptionTest * @run main FilterExceptionTest diff --git a/test/javax/management/notification/NotifExecutorTest.java b/test/javax/management/notification/NotifExecutorTest.java --- a/test/javax/management/notification/NotifExecutorTest.java +++ b/test/javax/management/notification/NotifExecutorTest.java @@ -26,7 +26,7 @@ * @bug 4661545 * @summary Tests to use an executor to send notifications. * @author Shanliang JIANG - * @modules java.management + * * @run clean NotifExecutorTest * @run build NotifExecutorTest * @run main NotifExecutorTest diff --git a/test/javax/management/notification/NotifInfoTest.java b/test/javax/management/notification/NotifInfoTest.java --- a/test/javax/management/notification/NotifInfoTest.java +++ b/test/javax/management/notification/NotifInfoTest.java @@ -26,7 +26,7 @@ * @bug 4506105 6303698 * @summary NotificationBroadcasterSupport should have a ctor with MBeanNotificationInfo[] * @author Shanliang JIANG - * @modules java.management + * * @run clean NotifInfoTest * @run build NotifInfoTest * @run main NotifInfoTest diff --git a/test/javax/management/openmbean/ArrayTypeTest.java b/test/javax/management/openmbean/ArrayTypeTest.java --- a/test/javax/management/openmbean/ArrayTypeTest.java +++ b/test/javax/management/openmbean/ArrayTypeTest.java @@ -26,7 +26,7 @@ * @bug 5045358 * @summary Test that Open MBeans support arrays of primitive types. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean ArrayTypeTest * @run build ArrayTypeTest * @run main ArrayTypeTest diff --git a/test/javax/management/openmbean/BadConstraintTest.java b/test/javax/management/openmbean/BadConstraintTest.java --- a/test/javax/management/openmbean/BadConstraintTest.java +++ b/test/javax/management/openmbean/BadConstraintTest.java @@ -27,7 +27,7 @@ * @summary Test that Open MBean attributes and parameters cannot have * illegal constraints like min greater than max * @author Eamonn McManus - * @modules java.management + * * @run clean BadConstraintTest * @run build BadConstraintTest * @run main BadConstraintTest diff --git a/test/javax/management/openmbean/CompositeDataStringTest.java b/test/javax/management/openmbean/CompositeDataStringTest.java --- a/test/javax/management/openmbean/CompositeDataStringTest.java +++ b/test/javax/management/openmbean/CompositeDataStringTest.java @@ -26,7 +26,6 @@ * @bug 6610174 * @summary Test that CompositeDataSupport.toString() represents arrays correctly * @author Eamonn McManus - * @modules java.management */ import javax.management.openmbean.ArrayType; diff --git a/test/javax/management/openmbean/ConstraintTest.java b/test/javax/management/openmbean/ConstraintTest.java --- a/test/javax/management/openmbean/ConstraintTest.java +++ b/test/javax/management/openmbean/ConstraintTest.java @@ -26,7 +26,7 @@ * @bug 6204469 * @summary Test that Open MBean attributes and parameters check constraints * @author Eamonn McManus - * @modules java.management + * * @run clean ConstraintTest * @run build ConstraintTest * @run main ConstraintTest diff --git a/test/javax/management/openmbean/EqualsTest.java b/test/javax/management/openmbean/EqualsTest.java --- a/test/javax/management/openmbean/EqualsTest.java +++ b/test/javax/management/openmbean/EqualsTest.java @@ -26,7 +26,7 @@ * @bug 5072174 * @summary Test CompositeDataSupport.equals with ArrayType * @author Shanliang JIANG - * @modules java.management + * * @run clean EqualsTest * @run build EqualsTest * @run main EqualsTest diff --git a/test/javax/management/openmbean/IsValueTest.java b/test/javax/management/openmbean/IsValueTest.java --- a/test/javax/management/openmbean/IsValueTest.java +++ b/test/javax/management/openmbean/IsValueTest.java @@ -26,7 +26,6 @@ * @bug 5072004 * @summary Test new rules for isValue * @author Eamonn McManus - * @modules java.management */ import javax.management.openmbean.*; diff --git a/test/javax/management/openmbean/NullConstructorParamsTest.java b/test/javax/management/openmbean/NullConstructorParamsTest.java --- a/test/javax/management/openmbean/NullConstructorParamsTest.java +++ b/test/javax/management/openmbean/NullConstructorParamsTest.java @@ -26,7 +26,6 @@ * @bug 6434298 * @summary Test IAE is thrown when typeName or description parameter is null for TabularType and CompositeType constructors * @author Joel FERAUD - * @modules java.management */ import javax.management.openmbean.*; diff --git a/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java b/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java --- a/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java +++ b/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java @@ -41,7 +41,7 @@ * @bug 8023529 * @summary Test that OpenMBean*Info.equals do not throw NPE * @author Shanliang JIANG - * @modules java.management + * * @run clean OpenMBeanInfoEqualsNPETest * @run build OpenMBeanInfoEqualsNPETest * @run main OpenMBeanInfoEqualsNPETest diff --git a/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java b/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java --- a/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java +++ b/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java @@ -40,7 +40,7 @@ * @bug 8023529 * @summary Test that OpenMBean*Info.hashCode do not throw NPE * @author Shanliang JIANG - * @modules java.management + * * @run clean OpenMBeanInfoHashCodeNPETest * @run build OpenMBeanInfoHashCodeNPETest * @run main OpenMBeanInfoHashCodeNPETest diff --git a/test/javax/management/openmbean/OpenTypeDescriptorTest.java b/test/javax/management/openmbean/OpenTypeDescriptorTest.java --- a/test/javax/management/openmbean/OpenTypeDescriptorTest.java +++ b/test/javax/management/openmbean/OpenTypeDescriptorTest.java @@ -28,7 +28,7 @@ * @summary Test that Open*MBeanInfo classes include "openType" in descriptor * and also test serial compatibility with Java 5. * @author Eamonn McManus - * @modules java.management + * * @run clean OpenTypeDescriptorTest * @run build OpenTypeDescriptorTest * @run main OpenTypeDescriptorTest diff --git a/test/javax/management/proxy/JMXProxyFallbackTest.java b/test/javax/management/proxy/JMXProxyFallbackTest.java --- a/test/javax/management/proxy/JMXProxyFallbackTest.java +++ b/test/javax/management/proxy/JMXProxyFallbackTest.java @@ -34,7 +34,7 @@ * It needs to be a separate class because the "jdk.jmx.mbeans.allowNonPublic" * system property must be set before c.s.j.m.MBeanAnalyzer has been loaded. * @author Jaroslav Bachorik - * @modules java.management + * * @run clean JMXProxyFallbackTest * @run build JMXProxyFallbackTest * @run main/othervm -Djdk.jmx.mbeans.allowNonPublic=true JMXProxyFallbackTest diff --git a/test/javax/management/proxy/JMXProxyTest.java b/test/javax/management/proxy/JMXProxyTest.java --- a/test/javax/management/proxy/JMXProxyTest.java +++ b/test/javax/management/proxy/JMXProxyTest.java @@ -33,7 +33,7 @@ * @summary Tests that javax.management.JMX creates proxies only for the * compliant MBeans/MXBeans * @author Jaroslav Bachorik - * @modules java.management + * * @run clean JMXProxyTest * @run build JMXProxyTest * @run main JMXProxyTest diff --git a/test/javax/management/proxy/NotificationEmitterProxy.java b/test/javax/management/proxy/NotificationEmitterProxy.java --- a/test/javax/management/proxy/NotificationEmitterProxy.java +++ b/test/javax/management/proxy/NotificationEmitterProxy.java @@ -26,7 +26,7 @@ * @summary Test that we can create proxies which are NotificationEmitters. * @bug 6411747 * @author Daniel Fuchs - * @modules java.management + * * @run clean NotificationEmitterProxy * @run build NotificationEmitterProxy * @run main NotificationEmitterProxy diff --git a/test/javax/management/proxy/ProxyObjectMethodsTest.java b/test/javax/management/proxy/ProxyObjectMethodsTest.java --- a/test/javax/management/proxy/ProxyObjectMethodsTest.java +++ b/test/javax/management/proxy/ProxyObjectMethodsTest.java @@ -26,7 +26,7 @@ * @bug 6177524 * @summary Test how to execute the 3 Object methods by a Proxy. * @author Shanliang JIANG - * @modules java.management + * * @run clean ProxyObjectMethodsTest * @run build ProxyObjectMethodsTest * @run main ProxyObjectMethodsTest diff --git a/test/javax/management/query/CustomQueryTest.java b/test/javax/management/query/CustomQueryTest.java --- a/test/javax/management/query/CustomQueryTest.java +++ b/test/javax/management/query/CustomQueryTest.java @@ -26,7 +26,6 @@ * @bug 6692027 * @summary Check that custom subclasses of QueryEval can be serialized. * @author Eamonn McManus - * @modules java.management */ import java.io.ByteArrayInputStream; diff --git a/test/javax/management/query/InstanceOfExpTest.java b/test/javax/management/query/InstanceOfExpTest.java --- a/test/javax/management/query/InstanceOfExpTest.java +++ b/test/javax/management/query/InstanceOfExpTest.java @@ -26,7 +26,7 @@ * @bug 5072174 6335848 * @summary test the new method javax.management.Query.isInstanceOf("className") * @author Shanliang JIANG - * @modules java.management + * * @run clean InstanceOfExpTest * @run build InstanceOfExpTest * @run main InstanceOfExpTest diff --git a/test/javax/management/query/QueryExpStringTest.java b/test/javax/management/query/QueryExpStringTest.java --- a/test/javax/management/query/QueryExpStringTest.java +++ b/test/javax/management/query/QueryExpStringTest.java @@ -26,7 +26,7 @@ * @bug 4886011 * @summary Test that QueryExp.toString() is reversible * @author Eamonn McManus - * @modules java.management + * * @run clean QueryExpStringTest * @run build QueryExpStringTest * @run main QueryExpStringTest diff --git a/test/javax/management/query/QueryMatchTest.java b/test/javax/management/query/QueryMatchTest.java --- a/test/javax/management/query/QueryMatchTest.java +++ b/test/javax/management/query/QueryMatchTest.java @@ -26,7 +26,7 @@ * @bug 6266438 * @summary Query.match code for character sequences like [a-z] is wrong. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean QueryMatchTest * @run build QueryMatchTest * @run main QueryMatchTest diff --git a/test/javax/management/query/QuerySubstringTest.java b/test/javax/management/query/QuerySubstringTest.java --- a/test/javax/management/query/QuerySubstringTest.java +++ b/test/javax/management/query/QuerySubstringTest.java @@ -27,7 +27,7 @@ * @summary Query.{initial,any,final}SubString fail if the * matching constraint string contains wildcards. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean QuerySubstringTest * @run build QuerySubstringTest * @run main QuerySubstringTest diff --git a/test/javax/management/query/SupportedQueryTypesTest.java b/test/javax/management/query/SupportedQueryTypesTest.java --- a/test/javax/management/query/SupportedQueryTypesTest.java +++ b/test/javax/management/query/SupportedQueryTypesTest.java @@ -26,7 +26,9 @@ * @bug 8058865 * @summary Tests most of the existing query types. * @author Olivier Lagneau + * * @modules java.management.rmi + * * @compile TestQuery.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD SupportedQueryTypesTest -mbeanClassName TestQuery */ diff --git a/test/javax/management/relation/NonArrayListTest.java b/test/javax/management/relation/NonArrayListTest.java --- a/test/javax/management/relation/NonArrayListTest.java +++ b/test/javax/management/relation/NonArrayListTest.java @@ -26,7 +26,7 @@ * @bug 4848474 * @summary Test that relation service doesn't require List params to be ArrayList * @author Eamonn McManus - * @modules java.management + * * @run clean NonArrayListTest * @run build NonArrayListTest * @run main NonArrayListTest diff --git a/test/javax/management/relation/RelationNotificationSeqNoTest.java b/test/javax/management/relation/RelationNotificationSeqNoTest.java --- a/test/javax/management/relation/RelationNotificationSeqNoTest.java +++ b/test/javax/management/relation/RelationNotificationSeqNoTest.java @@ -26,7 +26,6 @@ * @bug 6701459 * @summary Test sequence numbers in RelationService notifications. * @author Eamonn McManus - * @modules java.management */ /* diff --git a/test/javax/management/relation/RelationNotificationSourceTest.java b/test/javax/management/relation/RelationNotificationSourceTest.java --- a/test/javax/management/relation/RelationNotificationSourceTest.java +++ b/test/javax/management/relation/RelationNotificationSourceTest.java @@ -26,7 +26,7 @@ * @bug 4892674 * @summary Test that RelationNotification can be constructed with ObjectName. * @author Eamonn McManus - * @modules java.management + * * @run clean RelationNotificationSourceTest * @run build RelationNotificationSourceTest * @run main RelationNotificationSourceTest diff --git a/test/javax/management/relation/RelationTypeTest.java b/test/javax/management/relation/RelationTypeTest.java --- a/test/javax/management/relation/RelationTypeTest.java +++ b/test/javax/management/relation/RelationTypeTest.java @@ -26,7 +26,7 @@ * @bug 4716675 * @summary Test that relation type checking uses isInstanceOf * @author Eamonn McManus - * @modules java.management + * * @run clean RelationTypeTest * @run build RelationTypeTest * @run main RelationTypeTest diff --git a/test/javax/management/remote/mandatory/TEST.properties b/test/javax/management/remote/mandatory/TEST.properties new file mode 100644 --- /dev/null +++ b/test/javax/management/remote/mandatory/TEST.properties @@ -0,0 +1,2 @@ +modules = java.management.rmi + diff --git a/test/javax/management/remote/mandatory/URLTest.java b/test/javax/management/remote/mandatory/URLTest.java --- a/test/javax/management/remote/mandatory/URLTest.java +++ b/test/javax/management/remote/mandatory/URLTest.java @@ -26,7 +26,7 @@ * @bug 5057532 * @summary Tests that host names are parsed correctly in URLs * @author Eamonn McManus - * @modules java.management + * * @run clean URLTest * @run build URLTest * @run main URLTest diff --git a/test/javax/management/remote/mandatory/connection/AddressableTest.java b/test/javax/management/remote/mandatory/connection/AddressableTest.java --- a/test/javax/management/remote/mandatory/connection/AddressableTest.java +++ b/test/javax/management/remote/mandatory/connection/AddressableTest.java @@ -26,7 +26,7 @@ * @bug 6238815 * @summary test the new interface Addressable * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean AddressableTest * @run build AddressableTest * @run main AddressableTest diff --git a/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java b/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java @@ -24,10 +24,10 @@ /* * @test * @bug 4940957 8025205 + * @key intermittent * @summary Tests behaviour when connections break * @author Eamonn McManus - * @key intermittent - * @modules java.management.rmi + * * @run clean BrokenConnectionTest * @run build BrokenConnectionTest * @run main BrokenConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java b/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java --- a/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java @@ -26,7 +26,7 @@ * @bug 4921888 * @summary Tests that we do not get a NullPointException. * @author Shanliang JIANG - * @modules java.management + * * @run clean CloseFailedClientTest * @run build CloseFailedClientTest * @run main CloseFailedClientTest diff --git a/test/javax/management/remote/mandatory/connection/CloseServerTest.java b/test/javax/management/remote/mandatory/connection/CloseServerTest.java --- a/test/javax/management/remote/mandatory/connection/CloseServerTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseServerTest.java @@ -26,7 +26,7 @@ * @bug 4838640 * @summary test server close in different conditions. * @author Shanliang JIANG - * @modules java.management + * * @run clean CloseServerTest * @run build CloseServerTest * @run main CloseServerTest diff --git a/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java b/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java --- a/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java @@ -26,7 +26,7 @@ * @bug 4897052 * @summary Tests that opening and immediately closing a connector works * @author Eamonn McManus - * @modules java.management + * * @run clean CloseUnconnectedTest * @run build CloseUnconnectedTest * @run main CloseUnconnectedTest diff --git a/test/javax/management/remote/mandatory/connection/CloseableTest.java b/test/javax/management/remote/mandatory/connection/CloseableTest.java --- a/test/javax/management/remote/mandatory/connection/CloseableTest.java +++ b/test/javax/management/remote/mandatory/connection/CloseableTest.java @@ -28,7 +28,7 @@ * the method "void close() throws IOException;" extend * or implement the java.io.Closeable interface. * @author Luis-Miguel Alventosa - * @modules java.management.rmi + * * @run clean CloseableTest * @run build CloseableTest * @run main CloseableTest diff --git a/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java b/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java --- a/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java +++ b/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java @@ -26,7 +26,7 @@ * @bug 4943248 * @summary Tests that NullPointerException is thrown when listener is null. * @author Daniel Fuchs - * @modules java.management.rmi + * * @run clean ConnectionListenerNullTest * @run build ConnectionListenerNullTest * @run main ConnectionListenerNullTest diff --git a/test/javax/management/remote/mandatory/connection/ConnectionTest.java b/test/javax/management/remote/mandatory/connection/ConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/ConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/ConnectionTest.java @@ -26,7 +26,7 @@ * @bug 4865397 * @summary Tests remote JMX connections * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean ConnectionTest * @run build ConnectionTest * @run main ConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java b/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java --- a/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java +++ b/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java @@ -28,7 +28,7 @@ * @summary test the connector server option that causes it not to prevent the * VM from exiting * @author Shanliang JIANG, Eamonn McManus - * @modules java.management.rmi + * * @run main/othervm DaemonRMIExporterTest */ import java.util.Arrays; diff --git a/test/javax/management/remote/mandatory/connection/DeadLockTest.java b/test/javax/management/remote/mandatory/connection/DeadLockTest.java --- a/test/javax/management/remote/mandatory/connection/DeadLockTest.java +++ b/test/javax/management/remote/mandatory/connection/DeadLockTest.java @@ -26,7 +26,7 @@ * @bug 5039210 * @summary test on a client notification deadlock. * @author Shanliang JIANG - * @modules java.management + * * @run clean DeadLockTest * @run build DeadLockTest * @run main DeadLockTest diff --git a/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java b/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java @@ -27,7 +27,7 @@ * @bug 4939578 * @summary test to get an IOException. * @author Shanliang JIANG - * @modules java.management + * * @run clean FailedConnectionTest * @run build FailedConnectionTest * @run main FailedConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/GetConnectionTest.java b/test/javax/management/remote/mandatory/connection/GetConnectionTest.java --- a/test/javax/management/remote/mandatory/connection/GetConnectionTest.java +++ b/test/javax/management/remote/mandatory/connection/GetConnectionTest.java @@ -26,7 +26,7 @@ * @bug 4951414 * @summary Try to get an IOException. * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean GetConnectionTest * @run build GetConnectionTest * @run main GetConnectionTest diff --git a/test/javax/management/remote/mandatory/connection/IIOPURLTest.java b/test/javax/management/remote/mandatory/connection/IIOPURLTest.java --- a/test/javax/management/remote/mandatory/connection/IIOPURLTest.java +++ b/test/javax/management/remote/mandatory/connection/IIOPURLTest.java @@ -26,7 +26,7 @@ * @bug 4886799 * @summary Check that IIOP URLs have /ior/ in the path * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean IIOPURLTest * @run build IIOPURLTest * @run main IIOPURLTest diff --git a/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java b/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java --- a/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java +++ b/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java @@ -26,8 +26,10 @@ * @bug 4886838 4886830 8025204 * @summary Tests that idle timeouts happen at appropriate times * @author Eamonn McManus + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.util + * * @run clean IdleTimeoutTest * @run build IdleTimeoutTest * @run main IdleTimeoutTest diff --git a/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java b/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java --- a/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java +++ b/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java @@ -26,7 +26,7 @@ * @bug 7065236 * @summary Test for locale insensitive strings in JMXServiceURL class * @author Harsha Wardhana B - * @modules java.management + * * @run clean JMXServiceURLLocaleTest * @run build JMXServiceURLLocaleTest * @run main JMXServiceURLLocaleTest diff --git a/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java b/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java --- a/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java +++ b/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java @@ -26,7 +26,7 @@ * @bug 1234567 * @summary Open, connect then close multi-connectors. * @author Shanliang JIANG - * @modules java.management + * * @run clean MultiOpenCloseTest * @run build MultiOpenCloseTest * @run main MultiOpenCloseTest diff --git a/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java b/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java --- a/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java +++ b/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java @@ -45,7 +45,7 @@ * @bug 6697180 * @summary test on a client notification deadlock. * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean MultiThreadDeadLockTest * @run build MultiThreadDeadLockTest * @run main MultiThreadDeadLockTest diff --git a/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java b/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java --- a/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java +++ b/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java @@ -29,7 +29,9 @@ * thrown when constructor is invoked with null class loader as * an argument. * @author Amit Sapre + * * @modules java.management.rmi/javax.management.remote.rmi:open + * * @run clean ObjectInputStreamWithLoaderNullCheckTest * @run build ObjectInputStreamWithLoaderNullCheckTest * @run main ObjectInputStreamWithLoaderNullCheckTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java @@ -26,7 +26,7 @@ * @bug 4901808 7183800 * @summary Check that RMI connection ids include IP address of a client network interface * @author Eamonn McManus - * @modules java.management + * * @run clean RMIConnectionIdTest * @run build RMIConnectionIdTest * @run main RMIConnectionIdTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java @@ -42,7 +42,9 @@ * @bug 6566891 * @summary Check no memory leak on RMIConnector's rmbscMap * @author Shanliang JIANG + * * @modules java.management.rmi/javax.management.remote.rmi:open + * * @run clean RMIConnectorInternalMapTest * @run build RMIConnectorInternalMapTest * @run main RMIConnectorInternalMapTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java b/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java @@ -39,6 +39,7 @@ * @summary Check no memory leak on RMIConnector's nullSubjectConn * @author Shanliang JIANG * @modules java.management.rmi/javax.management.remote.rmi:open + * * @run clean RMIConnectorNullSubjectConnTest * @run build RMIConnectorNullSubjectConnTest * @run main RMIConnectorNullSubjectConnTest diff --git a/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java b/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java --- a/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java +++ b/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java @@ -25,12 +25,14 @@ * @test * @summary NPE IN RMIConnector.connect * @bug 6984520 + * * @library /java/rmi/testlibrary * @modules java.management.rmi * java.rmi/sun.rmi.registry * java.rmi/sun.rmi.server * java.rmi/sun.rmi.transport * java.rmi/sun.rmi.transport.tcp + * * @run clean RMIConnector_NPETest * @run build TestLibrary RMID * @run build RMIConnector_NPETest diff --git a/test/javax/management/remote/mandatory/connection/RMIExitTest.java b/test/javax/management/remote/mandatory/connection/RMIExitTest.java --- a/test/javax/management/remote/mandatory/connection/RMIExitTest.java +++ b/test/javax/management/remote/mandatory/connection/RMIExitTest.java @@ -27,7 +27,7 @@ * @bug 4917237 * @summary test that process exit immediately after stop() / close() called * @author Jean Francois Denise - * @modules java.management.rmi + * * @run clean RMIExitTest * @run build RMIExitTest * @run main RMIExitTest diff --git a/test/javax/management/remote/mandatory/connection/RMISerializeTest.java b/test/javax/management/remote/mandatory/connection/RMISerializeTest.java --- a/test/javax/management/remote/mandatory/connection/RMISerializeTest.java +++ b/test/javax/management/remote/mandatory/connection/RMISerializeTest.java @@ -26,7 +26,7 @@ * @summary Tests to serialize RMIConnector * @bug 5032052 * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean RMISerializeTest * @run build RMISerializeTest * @run main RMISerializeTest diff --git a/test/javax/management/remote/mandatory/connection/ReconnectTest.java b/test/javax/management/remote/mandatory/connection/ReconnectTest.java --- a/test/javax/management/remote/mandatory/connection/ReconnectTest.java +++ b/test/javax/management/remote/mandatory/connection/ReconnectTest.java @@ -26,7 +26,7 @@ * @bug 4927217 * @summary test to reconnect * @author Shanliang JIANG - * @modules java.management + * * @run clean ReconnectTest * @run build ReconnectTest * @run main ReconnectTest diff --git a/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java b/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java --- a/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java @@ -26,7 +26,6 @@ * @bug 6475157 * @summary Tests deadlock in simultaneous connection and connector-server close * @author Eamonn McManus - * @modules java.management.rmi */ /* This test is somewhat dependent on implementation details. If it suddenly diff --git a/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java b/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java --- a/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java @@ -27,7 +27,7 @@ * @summary Tests that JNDI bind failure doesn't leave an orphan RMI * Connector Server object * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean JNDIFailureTest * @run build JNDIFailureTest * @run main JNDIFailureTest diff --git a/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java b/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java --- a/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java @@ -27,7 +27,7 @@ * @summary Test that setting an MBeanServerForwarder on an already * started RMI connector server has the expected behavior. * @author Luis-Miguel Alventosa - * @modules java.management.rmi + * * @run clean MBSFPreStartPostStartTest * @run build MBSFPreStartPostStartTest * @run main MBSFPreStartPostStartTest diff --git a/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java b/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java --- a/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java +++ b/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java @@ -26,7 +26,9 @@ * @bug 5016705 * @summary Tests the use of the RMIExporter class. * @author Luis-Miguel Alventosa + * * @modules java.management.rmi/com.sun.jmx.remote.internal.rmi + * * @run clean RMIExporterTest * @run build RMIExporterTest * @run main RMIExporterTest diff --git a/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java b/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java --- a/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java +++ b/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java @@ -27,8 +27,10 @@ * @summary Tests that IllegalArgumentException is thrown when * MBeanServerForwrder is null. * @author Daniel Fuchs + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean SetMBeanServerForwarder * @run build SetMBeanServerForwarder * @run main SetMBeanServerForwarder diff --git a/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java b/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java --- a/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java +++ b/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java @@ -26,7 +26,7 @@ * @bug 4884913 * @summary Tests that default protocols are loaded correctly * @author Eamonn McManus - * @modules java.management + * * @run clean DefaultProviderTest * @run build DefaultProviderTest * @run main DefaultProviderTest diff --git a/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java b/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java --- a/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java +++ b/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java @@ -26,7 +26,7 @@ * @bug 4924683 * @summary Check RMI/JRMP stubs can be deserialized using user's loader * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean DeserializeEncodedURLTest SingleClassLoader * @run build DeserializeEncodedURLTest SingleClassLoader * @run main DeserializeEncodedURLTest diff --git a/test/javax/management/remote/mandatory/loading/MethodResultTest.java b/test/javax/management/remote/mandatory/loading/MethodResultTest.java --- a/test/javax/management/remote/mandatory/loading/MethodResultTest.java +++ b/test/javax/management/remote/mandatory/loading/MethodResultTest.java @@ -26,8 +26,9 @@ * @bug 4898478 * @summary Tests client default class loader used before JSR 160 loader * @author Eamonn McManus - * @modules java.management + * * @library /lib/testlibrary + * * @run clean MethodResultTest * @run build MethodResultTest * @run main MethodResultTest diff --git a/test/javax/management/remote/mandatory/loading/MissingClassTest.java b/test/javax/management/remote/mandatory/loading/MissingClassTest.java --- a/test/javax/management/remote/mandatory/loading/MissingClassTest.java +++ b/test/javax/management/remote/mandatory/loading/MissingClassTest.java @@ -24,13 +24,13 @@ /* * @test * @bug 4915825 4921009 4934965 4977469 8019584 + * @key randomness * @summary Tests behavior when client or server gets object of unknown class * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean MissingClassTest SingleClassLoader * @run build MissingClassTest SingleClassLoader * @run main MissingClassTest - * @key randomness */ /* diff --git a/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java b/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java --- a/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java +++ b/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java @@ -26,7 +26,7 @@ * @bug 5021246 * @summary Check that class downloading is supported by RMI connector * @author Eamonn McManus - * @modules java.management.rmi + * * @run main RMIDownloadTest receive without * @run main RMIDownloadTest send without * @run main RMIDownloadTest receive with diff --git a/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java b/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java --- a/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java +++ b/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java @@ -26,7 +26,7 @@ * @bug 4910428 * @summary Tests target MBean class loader used before JSR 160 loader * @author Eamonn McManus - * @modules java.management.rmi + * * @run clean TargetMBeanTest * @run build TargetMBeanTest * @run main TargetMBeanTest diff --git a/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java b/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java --- a/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java +++ b/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java @@ -26,7 +26,7 @@ * @bug 6356458 * @summary test to not lose a user classloader * @author Shanliang JIANG - * @modules java.management + * * @run clean UserClassLoaderTest * @run build UserClassLoaderTest * @run main UserClassLoaderTest diff --git a/test/javax/management/remote/mandatory/notif/AddRemoveTest.java b/test/javax/management/remote/mandatory/notif/AddRemoveTest.java --- a/test/javax/management/remote/mandatory/notif/AddRemoveTest.java +++ b/test/javax/management/remote/mandatory/notif/AddRemoveTest.java @@ -27,7 +27,7 @@ * @bug 4838640 4917194 * @summary test on add/remove NotificationListener * @author Shanliang JIANG - * @modules java.management + * * @run clean AddRemoveTest * @run build AddRemoveTest * @run main AddRemoveTest diff --git a/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java b/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java --- a/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java +++ b/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java @@ -26,7 +26,7 @@ * @bug 7120365 * @summary test on Concurrent Modification * @author Shanliang JIANG - * @modules java.management.rmi + * * @run main ConcurrentModificationTest */ diff --git a/test/javax/management/remote/mandatory/notif/DeadListenerTest.java b/test/javax/management/remote/mandatory/notif/DeadListenerTest.java --- a/test/javax/management/remote/mandatory/notif/DeadListenerTest.java +++ b/test/javax/management/remote/mandatory/notif/DeadListenerTest.java @@ -25,9 +25,11 @@ * @test * @bug 6957378 * @summary Test that a listener can be removed remotely from an MBean that no longer exists. + * @author Eamonn McManus + * * @modules java.management.rmi/javax.management.remote.rmi:open * java.management/com.sun.jmx.remote.internal:+open - * @author Eamonn McManus + * * @run main/othervm -XX:+UsePerfData DeadListenerTest */ diff --git a/test/javax/management/remote/mandatory/notif/DiffHBTest.java b/test/javax/management/remote/mandatory/notif/DiffHBTest.java --- a/test/javax/management/remote/mandatory/notif/DiffHBTest.java +++ b/test/javax/management/remote/mandatory/notif/DiffHBTest.java @@ -26,7 +26,7 @@ * @bug 4911721 * @summary test on add/remove NotificationListener * @author Shanliang JIANG - * @modules java.management + * * @run clean DiffHBTest * @run build DiffHBTest * @run main DiffHBTest diff --git a/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java b/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java --- a/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java +++ b/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java @@ -27,7 +27,7 @@ * @summary Check that the expected notification is received by the JMX * client even when the domain in the ObjectName is not specified * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean EmptyDomainNotificationTest * @run build EmptyDomainNotificationTest * @run main EmptyDomainNotificationTest diff --git a/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java b/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java --- a/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java +++ b/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java @@ -26,9 +26,9 @@ * @bug 6338874 * @summary Check that notification dispatch is not linear in number of MBeans. * @author Eamonn McManus - * @modules java.management.rmi * * @library /lib/testlibrary + * * @run build jdk.testlibrary.* ListenerScaleTest * @run main ListenerScaleTest */ diff --git a/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java b/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java --- a/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java +++ b/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java @@ -23,10 +23,10 @@ /* * @test + * @bug 5022196 8132003 * @summary Tests to send a not serializable notification. - * @bug 5022196 8132003 * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean NotSerializableNotifTest * @run build NotSerializableNotifTest * @run main NotSerializableNotifTest diff --git a/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java b/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java --- a/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java +++ b/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java @@ -26,7 +26,7 @@ * @bug 6174229 * @summary Verify the property name specifying server notification buffer size. * @author Shanliang JIANG - * @modules java.management + * * @run clean NotifBufferSizePropertyNameTest * @run build NotifBufferSizePropertyNameTest * @run main NotifBufferSizePropertyNameTest diff --git a/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java b/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java --- a/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java +++ b/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java @@ -26,7 +26,7 @@ * @bug 6199899 * @summary Tests reconnection done by a fetching notif thread. * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean NotifReconnectDeadlockTest * @run build NotifReconnectDeadlockTest * @run main NotifReconnectDeadlockTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java b/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java @@ -26,8 +26,10 @@ * @bug 5106721 * @summary Check the NotificationAccessController methods are properly called. * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean NotificationAccessControllerTest * @run build NotificationAccessControllerTest * @run main NotificationAccessControllerTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java @@ -26,7 +26,7 @@ * @bug 4934236 * @summary Tests that NotificationBuffer is created when used. * @author jfd@... - * @modules java.management.rmi + * * @run clean NotificationBufferCreationTest NotificationSender * @run build NotificationBufferCreationTest * @run main NotificationBufferCreationTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java @@ -27,7 +27,7 @@ * @summary Tests NotificationBuffer doesn't hold locks when adding listeners, * if test times out then deadlock is suspected. * @author Eamonn McManus - * @modules java.management + * * @run clean NotificationBufferDeadlockTest * @run build NotificationBufferDeadlockTest * @run main NotificationBufferDeadlockTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java b/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java @@ -26,8 +26,10 @@ * @bug 7654321 * @summary Tests the NotificationBuffer class. * @author Eamonn McManus + * * @modules java.management/com.sun.jmx.remote.internal * java.management/com.sun.jmx.remote.util + * * @run clean NotificationBufferTest * @run build NotificationBufferTest NotificationSender NotificationSenderMBean * @run main NotificationBufferTest diff --git a/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java b/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java --- a/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java +++ b/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java @@ -24,11 +24,11 @@ /* * @test * @bug 5106721 + * @key intermittent * @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.rmi + * * @run clean NotificationEmissionTest * @run build NotificationEmissionTest * @run main NotificationEmissionTest 1 diff --git a/test/javax/management/remote/mandatory/notif/RMINotifTest.java b/test/javax/management/remote/mandatory/notif/RMINotifTest.java --- a/test/javax/management/remote/mandatory/notif/RMINotifTest.java +++ b/test/javax/management/remote/mandatory/notif/RMINotifTest.java @@ -25,9 +25,8 @@ * @test * @bug 7654321 * @summary Tests to receive notifications for opened and closed connections -ions * @author sjiang - * @modules java.management.rmi + * * @run clean RMINotifTest * @run build RMINotifTest * @run main RMINotifTest diff --git a/test/javax/management/remote/mandatory/notif/ServerNotifs.java b/test/javax/management/remote/mandatory/notif/ServerNotifs.java --- a/test/javax/management/remote/mandatory/notif/ServerNotifs.java +++ b/test/javax/management/remote/mandatory/notif/ServerNotifs.java @@ -27,7 +27,7 @@ * @summary Tests the reception of the notifications for opened and closed * connections * @author sjiang - * @modules java.management.rmi + * * @run clean ServerNotifs * @run build ServerNotifs * @run main ServerNotifs diff --git a/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java b/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java --- a/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java +++ b/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java @@ -27,7 +27,7 @@ * @summary Tests whether a listener receives notifs emitted before the * listener is registered. * @author Shanliang JIANG - * @modules java.management.rmi + * * @run clean UnexpectedNotifTest * @run build UnexpectedNotifTest * @run main UnexpectedNotifTest diff --git a/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java b/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java --- a/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java +++ b/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java @@ -27,7 +27,7 @@ * @summary Tests that MBeanServerFileAccessController supports * principals other than JMXPrincipal. * @author Luis-Miguel Alventosa - * @modules java.management.rmi + * * @run clean NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean * @run build NonJMXPrincipalsTest SimpleStandard SimpleStandardMBean * @run main NonJMXPrincipalsTest diff --git a/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java b/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java --- a/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java +++ b/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java @@ -27,7 +27,7 @@ * @summary Tests the use of the "jmx.remote.x.password.file" and * "jmx.remote.x.access.file" environment map properties. * @author Luis-Miguel Alventosa - * @modules java.management.rmi + * * @run clean PasswordAccessFileTest SimpleStandard SimpleStandardMBean * @run build PasswordAccessFileTest SimpleStandard SimpleStandardMBean * @run main PasswordAccessFileTest diff --git a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java --- a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java +++ b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java @@ -26,8 +26,10 @@ * @bug 5016508 * @summary Supplies an alternative JAAS configuration for authenticating RMI clients * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean RMIAltAuthTest * @run build RMIAltAuthTest SimpleStandard SimpleStandardMBean * @run main RMIAltAuthTest diff --git a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java --- a/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java +++ b/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java @@ -26,8 +26,10 @@ * @bug 5016508 * @summary Tests the default JAAS configuration for authenticating RMI clients * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean RMIPasswdAuthTest * @run build RMIPasswdAuthTest SimpleStandard SimpleStandardMBean * @run main RMIPasswdAuthTest diff --git a/test/javax/management/remote/mandatory/provider/ProviderTest.java b/test/javax/management/remote/mandatory/provider/ProviderTest.java --- a/test/javax/management/remote/mandatory/provider/ProviderTest.java +++ b/test/javax/management/remote/mandatory/provider/ProviderTest.java @@ -24,7 +24,7 @@ /* * @test ProviderTest.java * @summary Tests jar services provider are called - * @modules java.management.rmi + * * @run clean ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl * @run build ProviderTest provider.JMXConnectorProviderImpl provider.JMXConnectorServerProviderImpl * @run main ProviderTest diff --git a/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java b/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java --- a/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java +++ b/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java @@ -26,8 +26,10 @@ * @bug 4871761 * @summary Tests that JMXServiceErrorException is correctly emitted. * @author Daniel Fuchs + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean JMXServerErrorTest * @run build JMXServerErrorTest * @run main JMXServerErrorTest diff --git a/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java b/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java --- a/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java +++ b/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java @@ -26,7 +26,7 @@ * @bug 7654321 * @summary Tests the use of the custom RMI socket factories. * @author Luis-Miguel Alventosa - * @modules java.management.rmi + * * @run clean RMISocketFactoriesTest * @run build RMISocketFactoriesTest RMIClientFactory RMIServerFactory * @run main RMISocketFactoriesTest test_server_factory diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java @@ -27,8 +27,10 @@ * @summary Tests the use of the subject delegation feature in the * RMI connector * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean SubjectDelegation1Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation1Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation1Test policy11 ok diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java @@ -27,8 +27,10 @@ * @summary Tests the use of the subject delegation feature on the authenticated * principals within the RMI connector server's creator codebase. * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean SubjectDelegation2Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation2Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation2Test policy21 ok diff --git a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java --- a/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java +++ b/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java @@ -28,8 +28,10 @@ * principals within the RMI connector server's creator codebase with * subject delegation. * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.security + * * @run clean SubjectDelegation3Test SimpleStandard SimpleStandardMBean * @run build SubjectDelegation3Test SimpleStandard SimpleStandardMBean * @run main SubjectDelegation3Test policy31 ok diff --git a/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java b/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java --- a/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java +++ b/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java @@ -26,7 +26,7 @@ * @bug 8141591 * @summary Tests if notifications are received after executor is shutdown * @author Harsha Wardhana B - * @modules java.management + * * @run clean ExecutorShutdownTest * @run build ExecutorShutdownTest * @run main ExecutorShutdownTest diff --git a/test/javax/management/remote/mandatory/threads/ExecutorTest.java b/test/javax/management/remote/mandatory/threads/ExecutorTest.java --- a/test/javax/management/remote/mandatory/threads/ExecutorTest.java +++ b/test/javax/management/remote/mandatory/threads/ExecutorTest.java @@ -26,7 +26,7 @@ * @bug 6190873 * @summary Tests that thread creation can use a user-supplied Executor * @author Eamonn McManus - * @modules java.management + * * @run clean ExecutorTest * @run build ExecutorTest * @run main ExecutorTest diff --git a/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java b/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java --- a/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java +++ b/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java @@ -26,7 +26,7 @@ * @bug 6192124 * @summary Tests that you can turn off the server connection timeout thread * @author Eamonn McManus - * @modules java.management + * * @run clean NoServerTimeoutTest * @run build NoServerTimeoutTest * @run main NoServerTimeoutTest diff --git a/test/javax/management/remote/mandatory/util/MapNullValuesTest.java b/test/javax/management/remote/mandatory/util/MapNullValuesTest.java --- a/test/javax/management/remote/mandatory/util/MapNullValuesTest.java +++ b/test/javax/management/remote/mandatory/util/MapNullValuesTest.java @@ -31,8 +31,10 @@ * Check also that null values for keys are not allowed in * the maps passed to the JMXConnector[Server] factories. * @author Luis-Miguel Alventosa + * * @modules java.management.rmi * java.management/com.sun.jmx.remote.util + * * @run clean MapNullValuesTest * @run build MapNullValuesTest * @run main MapNullValuesTest diff --git a/test/javax/management/remote/mandatory/version/ImplVersionTest.java b/test/javax/management/remote/mandatory/version/ImplVersionTest.java --- a/test/javax/management/remote/mandatory/version/ImplVersionTest.java +++ b/test/javax/management/remote/mandatory/version/ImplVersionTest.java @@ -29,7 +29,7 @@ * test codebase has the java permission to read the "java.runtime.version" * system property. * @author Luis-Miguel Alventosa, Joel Feraud - * @modules java.management + * * @run clean ImplVersionTest ImplVersionCommand * @run build ImplVersionTest ImplVersionCommand ImplVersionReader * @run main ImplVersionTest diff --git a/test/javax/management/security/AuthorizationTest.java b/test/javax/management/security/AuthorizationTest.java --- a/test/javax/management/security/AuthorizationTest.java +++ b/test/javax/management/security/AuthorizationTest.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Checks various authentication behavior from remote jmx client * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile Simple.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username1 -Dpassword=password1 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=username2 -Dpassword=password2 AuthorizationTest -server -mapType x.access.file;x.password.file -populate -client -mapType credentials -expectedCreateException -expectedSetException -expectedInvokeException diff --git a/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java b/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java --- a/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java +++ b/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java @@ -27,7 +27,7 @@ * @summary Test that MBeanServer.queryNames doesn't call getMBeanInfo on every * resultant MBean when there is no security manager installed. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean AvoidGetMBeanInfoCallsTest * @run build AvoidGetMBeanInfoCallsTest * @run main AvoidGetMBeanInfoCallsTest diff --git a/test/javax/management/security/MBeanPermissionTest.java b/test/javax/management/security/MBeanPermissionTest.java --- a/test/javax/management/security/MBeanPermissionTest.java +++ b/test/javax/management/security/MBeanPermissionTest.java @@ -26,7 +26,7 @@ * @bug 6228749 * @summary MBeanPermission(null,"") should throw IllegalArgumentException. * @author Luis-Miguel Alventosa - * @modules java.management + * * @run clean MBeanPermissionTest * @run build MBeanPermissionTest * @run main MBeanPermissionTest diff --git a/test/javax/management/security/SecurityTest.java b/test/javax/management/security/SecurityTest.java --- a/test/javax/management/security/SecurityTest.java +++ b/test/javax/management/security/SecurityTest.java @@ -26,8 +26,10 @@ * @bug 8058865 * @summary Checks various secure ways of connecting from remote jmx client * @author Olivier Lagneau + * + * @library /lib/testlibrary * @modules java.management.rmi - * @library /lib/testlibrary + * * @compile MBS_Light.java ServerDelegate.java TestSampleLoginModule.java * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=SQE_username -Dpassword=SQE_password SecurityTest -server -mapType x.password.file -client -mapType credentials * @run main/othervm/timeout=300 -DDEBUG_STANDARD -Dusername=UNKNOWN_username -Dpassword=SQE_password SecurityTest -server -mapType x.password.file -client -mapType credentials -expectedThrowable java.lang.SecurityException diff --git a/test/javax/management/standardmbean/DeadlockTest.java b/test/javax/management/standardmbean/DeadlockTest.java --- a/test/javax/management/standardmbean/DeadlockTest.java +++ b/test/javax/management/standardmbean/DeadlockTest.java @@ -26,7 +26,7 @@ * @bug 6331746 * @summary Test a deadlock and will be blocked forever if the deadlock is present. * @author Shanliang JIANG - * @modules java.management + * * @run main DeadlockTest */ diff --git a/test/javax/management/timer/MissingNotificationTest.java b/test/javax/management/timer/MissingNotificationTest.java --- a/test/javax/management/timer/MissingNotificationTest.java +++ b/test/javax/management/timer/MissingNotificationTest.java @@ -24,13 +24,13 @@ /* * @test * @bug 6809322 + * @key randomness * @summary Test for missing notifications in a high concurrency environment * @author Jaroslav Bachorik - * @modules java.management + * * @run clean MissingNotificationTest * @run build MissingNotificationTest * @run main MissingNotificationTest - * @key randomness */ import java.util.Date; diff --git a/test/javax/management/timer/StartTest.java b/test/javax/management/timer/StartTest.java --- a/test/javax/management/timer/StartTest.java +++ b/test/javax/management/timer/StartTest.java @@ -26,7 +26,7 @@ * @bug 6659215 * @summary Test on timer start method with past notifications * @author Shanliang JIANG - * @modules java.management + * * @run clean StartTest * @run build StartTest * @run main StartTest diff --git a/test/sun/jvmstat/TEST.properties b/test/sun/jvmstat/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/jvmstat/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.internal.jvmstat/sun.jvmstat.monitor + diff --git a/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java b/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java --- a/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java +++ b/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java @@ -24,7 +24,6 @@ /* * @test * @bug 4990825 - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor * @summary test that HostIdentifier objects get created as expected */ diff --git a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java --- a/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java +++ b/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java @@ -66,10 +66,12 @@ * @test * @bug 4990825 * @summary attach to external but local JVM processes + * * @library /lib/testlibrary * @modules java.management * jdk.internal.jvmstat/sun.jvmstat.monitor * jdk.internal.jvmstat/sun.jvmstat.monitor.event + * * @build jdk.testlibrary.* * @run main/othervm MonitorVmStartTerminate */ diff --git a/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java b/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java --- a/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java +++ b/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java @@ -40,9 +40,10 @@ * @test * @bug 6672135 * @summary setInterval() for local MonitoredHost and local MonitoredVm - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor + * * @library /lib/testlibrary * @library /test/lib + * * @build jdk.testlibrary.* * @build jdk.test.lib.apps.* * @run main TestPollingInterval diff --git a/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java b/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java --- a/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java +++ b/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java @@ -24,7 +24,6 @@ /* * @test * @bug 4990825 - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor * @summary test that VmIdentifier objects get created as expected */ diff --git a/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java b/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java --- a/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java +++ b/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java @@ -24,9 +24,9 @@ /* * @test * @bug 4990825 - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor + * @summary prolog size and overflow sanity checks + * * @run main/othervm -XX:+UsePerfData PrologSizeSanityCheck - * @summary prolog size and overflow sanity checks */ import sun.jvmstat.monitor.*; diff --git a/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java b/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java --- a/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getClassInitializationTime() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetClassInitializationTime */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java b/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java --- a/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getClassLoadingTime() * @author Steve Bohne - * @modules java.management/sun.management + * * @build ClassToLoad0 * @run main/othervm -XX:+UsePerfData GetClassLoadingTime */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java b/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java --- a/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getInitializedClassCount() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetInitializedClassCount */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java b/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getLoadedClassSize() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetLoadedClassSize */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java b/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getMethodDataSize() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetMethodDataSize */ diff --git a/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java b/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java --- a/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java +++ b/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getUnloadedClassSize() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetUnloadedClassSize */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java b/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java --- a/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java +++ b/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotClassLoadingMBean.getSafepointCount() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetSafepointCount */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java b/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java --- a/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java +++ b/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java @@ -26,7 +26,7 @@ * @bug 4858522 * @summary Basic unit test of HotspotRuntimeMBean.getSafepointSyncTime() * @author Steve Bohne - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetSafepointSyncTime */ diff --git a/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java b/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java --- a/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java +++ b/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java @@ -24,8 +24,8 @@ /* * @test * @bug 4858522 - * @modules java.management/sun.management * @summary Basic unit test of HotspotRuntimeMBean.getTotalSafepointTime() + * * @run main/othervm -XX:+UsePerfData GetTotalSafepointTime */ diff --git a/test/sun/management/HotspotThreadMBean/GetInternalThreads.java b/test/sun/management/HotspotThreadMBean/GetInternalThreads.java --- a/test/sun/management/HotspotThreadMBean/GetInternalThreads.java +++ b/test/sun/management/HotspotThreadMBean/GetInternalThreads.java @@ -27,7 +27,7 @@ * @summary Basic Test for HotspotThreadMBean.getInternalThreadCount() * and getInternalThreadCpuTime() * @author Mandy Chung - * @modules java.management/sun.management + * * @run main/othervm -XX:+UsePerfData GetInternalThreads */ diff --git a/test/sun/management/LazyCompositeDataTest.java b/test/sun/management/LazyCompositeDataTest.java --- a/test/sun/management/LazyCompositeDataTest.java +++ b/test/sun/management/LazyCompositeDataTest.java @@ -36,7 +36,6 @@ * @test * @bug 8139870 * @summary sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType - * @modules java.management/sun.management * @author Jaroslav Bachorik */ @@ -160,4 +159,5 @@ } System.out.println("=== PASSED"); } -} \ No newline at end of file +} + diff --git a/test/sun/management/LoggingTest/LoggingWithJULTest.java b/test/sun/management/LoggingTest/LoggingWithJULTest.java --- a/test/sun/management/LoggingTest/LoggingWithJULTest.java +++ b/test/sun/management/LoggingTest/LoggingWithJULTest.java @@ -26,11 +26,14 @@ /** * @test * @bug 8172971 - * @modules java.management java.logging * @summary Smoke test to check that logging in java.management works as expected. + * @author danielfuchs + * + * @modules java.management + * java.logging + * * @build LoggingTest LoggingWithJULTest * @run main/othervm LoggingWithJULTest - * @author danielfuchs */ public class LoggingWithJULTest { diff --git a/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java b/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java --- a/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java +++ b/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java @@ -24,13 +24,13 @@ /** * @test * @bug 8172971 - * @modules java.management * @summary Smoke test to check that logging in java.management is performed * through System.Logger. This test installs a LoggerFinder service * provider and verifies that it gets the traces. + * @author danielfuchs + * * @build test.loggerfinder/test.loggerfinder.TestLoggerFinder LoggingTest LoggingWithLoggerFinderTest * @run main/othervm --add-modules test.loggerfinder LoggingWithLoggerFinderTest - * @author danielfuchs */ public class LoggingWithLoggerFinderTest { diff --git a/test/sun/management/PlatformMBeanProviderConstructorCheck.java b/test/sun/management/PlatformMBeanProviderConstructorCheck.java --- a/test/sun/management/PlatformMBeanProviderConstructorCheck.java +++ b/test/sun/management/PlatformMBeanProviderConstructorCheck.java @@ -31,8 +31,9 @@ * @test * @bug 8042901 * @summary Check permission for PlatformMBeanProvider Constructor + * @author Shanliang Jiang + * * @modules java.management/sun.management.spi - * @author Shanliang Jiang */ public class PlatformMBeanProviderConstructorCheck { public static void main(String[] args) throws Exception { diff --git a/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java b/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java --- a/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java +++ b/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java @@ -15,9 +15,9 @@ * @test * @bug 8139587 * @summary Check backward compatibility of StackTraceElementCompositeData - * @modules java.management/sun.management + * @author Jaroslav Bachorik + * * @run testng CompatibilityTest - * @author Jaroslav Bachorik */ public class CompatibilityTest { @@ -69,4 +69,5 @@ assertNull(ste.getModuleName()); assertNull(ste.getModuleVersion()); } -} \ No newline at end of file +} + diff --git a/test/sun/management/TEST.properties b/test/sun/management/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/management/TEST.properties @@ -0,0 +1,2 @@ +modules = java.management/sun.management + diff --git a/test/sun/management/jdp/JdpDefaultsTest.java b/test/sun/management/jdp/JdpDefaultsTest.java --- a/test/sun/management/jdp/JdpDefaultsTest.java +++ b/test/sun/management/jdp/JdpDefaultsTest.java @@ -30,8 +30,9 @@ /* * @test JdpDefaultsTest * @summary Assert that we can read JDP packets from a multicast socket connection, on default IP and port. + * * @library /lib/testlibrary - * @modules jdk.management.agent/sun.management.jdp + * * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main/othervm JdpDefaultsTest */ diff --git a/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java b/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java --- a/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java +++ b/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java @@ -22,14 +22,15 @@ */ /** - * @test JdpJmxRemoteDynamicPortTest.java - * @bug 8167337 - * @summary Verify a non-zero value is assigned to jmxremote.port - * when VM is started with jmxremote.port=0. - * @library /lib/testlibrary - * @modules jdk.management.agent/sun.management.jdp - * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpJmxRemoteDynamicPortTestCase DynamicLauncher - * @run main/othervm JdpJmxRemoteDynamicPortTest + * @test JdpJmxRemoteDynamicPortTest.java + * @bug 8167337 + * @summary Verify a non-zero value is assigned to jmxremote.port + * when VM is started with jmxremote.port=0. + * + * @library /lib/testlibrary + * + * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpJmxRemoteDynamicPortTestCase DynamicLauncher + * @run main/othervm JdpJmxRemoteDynamicPortTest */ import java.lang.management.ManagementFactory; diff --git a/test/sun/management/jdp/JdpOffTest.java b/test/sun/management/jdp/JdpOffTest.java --- a/test/sun/management/jdp/JdpOffTest.java +++ b/test/sun/management/jdp/JdpOffTest.java @@ -31,8 +31,9 @@ /* * @test JdpOffTest.java * @summary Assert that no JDP packets are sent to the default address and port. + * * @library /lib/testlibrary - * @modules jdk.management.agent/sun.management.jdp + * * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOffTestCase DynamicLauncher * @run main/othervm JdpOffTest */ diff --git a/test/sun/management/jdp/JdpSpecificAddressTest.java b/test/sun/management/jdp/JdpSpecificAddressTest.java --- a/test/sun/management/jdp/JdpSpecificAddressTest.java +++ b/test/sun/management/jdp/JdpSpecificAddressTest.java @@ -30,8 +30,9 @@ /* * @test JdpSpecificAddressTest * @summary Assert that we can read JDP packets from a multicast socket connection, on specific IP and port. + * * @library /lib/testlibrary - * @modules jdk.management.agent/sun.management.jdp + * * @build jdk.testlibrary.* ClientConnection JdpTestUtil JdpTestCase JdpOnTestCase DynamicLauncher * @run main/othervm JdpSpecificAddressTest */ diff --git a/test/sun/management/jdp/TEST.properties b/test/sun/management/jdp/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/management/jdp/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.management.agent/sun.management.jdp + diff --git a/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java b/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java --- a/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java +++ b/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java @@ -22,15 +22,14 @@ */ /** - * @test LocalRMIServerSocketFactoryTest.java - * @bug 6774170 - * @summary Connect to a server socket returned by the LocalRMIServerSocketFactory. + * @test LocalRMIServerSocketFactoryTest.java + * @bug 6774170 + * @summary Connect to a server socket returned by the LocalRMIServerSocketFactory. * - * @author Daniel Fuchs + * @author Daniel Fuchs * - * @modules jdk.management.agent/sun.management.jmxremote - * @run compile -XDignore.symbol.file=true -g LocalRMIServerSocketFactoryTest.java - * @run main LocalRMIServerSocketFactoryTest + * @run compile -XDignore.symbol.file=true -g LocalRMIServerSocketFactoryTest.java + * @run main LocalRMIServerSocketFactoryTest */ import sun.management.jmxremote.LocalRMIServerSocketFactory; diff --git a/test/sun/management/jmxremote/RunTest.sh b/test/sun/management/jmxremote/RunTest.sh --- a/test/sun/management/jmxremote/RunTest.sh +++ b/test/sun/management/jmxremote/RunTest.sh @@ -21,7 +21,7 @@ # questions. # -# Execute the test. +# Execute the test. # No need to compile (now done by JTReg tags in calling file) # echo ${TESTJAVA}/bin/java ${TESTVMOPTS} -Dtest.src=${TESTCLASSES} \ diff --git a/test/sun/management/jmxremote/TEST.properties b/test/sun/management/jmxremote/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/management/jmxremote/TEST.properties @@ -0,0 +1,3 @@ +modules = jdk.management.agent/jdk.internal.agent \ + jdk.management.agent/sun.management.jmxremote + diff --git a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java --- a/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java +++ b/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java @@ -40,12 +40,13 @@ /** * @test * @bug 6434402 8004926 + * @author Jaroslav Bachorik + * * @library /lib/testlibrary - * @modules jdk.management.agent/jdk.internal.agent + * * @build jdk.testlibrary.* * @build TestManager TestApplication CustomLauncherTest * @run main/othervm CustomLauncherTest - * @author Jaroslav Bachorik */ public class CustomLauncherTest { private static final String TEST_CLASSPATH = System.getProperty("test.class.path"); diff --git a/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java b/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java --- a/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java +++ b/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java @@ -48,9 +48,8 @@ * @summary Test JMX agent host address binding. Same ports but different * interfaces to bind to (using plain sockets and SSL sockets). * - * @modules jdk.management.agent/jdk.internal.agent - * jdk.management.agent/sun.management.jmxremote * @library /lib/testlibrary + * * @build jdk.testlibrary.* JMXAgentInterfaceBinding * @run main/timeout=5 JMXInterfaceBindingTest */ diff --git a/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java b/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java --- a/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java +++ b/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java @@ -27,7 +27,7 @@ * @summary Tests that the jvmstat counters published by the out-of-the-box * management agent for the JMX connection details are correct. * @author Luis-Miguel Alventosa - * @modules jdk.management.agent/jdk.internal.agent + * * @run clean JvmstatCountersTest * @run build JvmstatCountersTest * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1 diff --git a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java --- a/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java +++ b/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java @@ -32,13 +32,14 @@ /** * @test - * @library /lib/testlibrary * @bug 5016507 6173612 6319776 6342019 6484550 8004926 * @summary Start a managed VM and test that a management tool can connect * without connection or username/password details. * TestManager will attempt a connection to the address obtained from * both agent properties and jvmstat buffer. - * @modules jdk.management.agent/jdk.internal.agent + * + * @library /lib/testlibrary + * * @build jdk.testlibrary.* TestManager TestApplication * @run main/othervm/timeout=300 LocalManagementTest */ diff --git a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java --- a/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java +++ b/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java @@ -25,14 +25,14 @@ /** * @test - * @library /lib/testlibrary * @bug 6557093 * @summary Check SSL config file permission for out-of-the-box management - * @modules jdk.management.agent + * @author Taras Ledkov + * + * @library /lib/testlibrary + * * @build jdk.testlibrary.* AbstractFilePermissionTest Dummy * @run main/timeout=300 PasswordFilePermissionTest - * - * @author Taras Ledkov */ public class PasswordFilePermissionTest extends AbstractFilePermissionTest { diff --git a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh @@ -24,12 +24,11 @@ # # @test # @bug 6528083 +# @key intermittent # @summary Test RMI Bootstrap # -# @key intermittent # @library /lib/testlibrary -# @modules jdk.management.agent/jdk.internal.agent -# jdk.management.agent/sun.management.jmxremote +# # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest # @run shell/timeout=300 RmiBootstrapTest.sh @@ -44,7 +43,7 @@ rm -rf ${TESTCLASSES}/ssl mkdir -p ${TESTCLASSES}/ssl -cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl +cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl chmod -R 777 ${TESTCLASSES}/ssl DEBUGOPTIONS="" @@ -56,7 +55,7 @@ # Call the common generic test # -# No need to since bug 4267864 is now fixed. +# No need to since bug 4267864 is now fixed. # echo ------------------------------------------------------------- echo Launching test for `basename $0 .sh` diff --git a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java --- a/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java +++ b/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java @@ -39,13 +39,14 @@ /** * @test - * @library /lib/testlibrary * @bug 6228231 * @summary Test that RMI registry uses SSL. - * @modules jdk.management.agent + * @author Luis-Miguel Alventosa, Taras Ledkov + * + * @library /lib/testlibrary + * * @build jdk.testlibrary.* RmiRegistrySslTestApp * @run main/timeout=300 RmiRegistrySslTest - * @author Luis-Miguel Alventosa, Taras Ledkov */ public class RmiRegistrySslTest { private final String TEST_CLASS_PATH = System.getProperty("test.class.path"); diff --git a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh @@ -27,8 +27,7 @@ # @summary Test RMI Bootstrap with SSL # # @library /lib/testlibrary -# @modules jdk.management.agent/jdk.internal.agent -# jdk.management.agent/sun.management.jmxremote +# # @build jdk.testlibrary.* TestLogger Utils RmiBootstrapTest # @run shell/timeout=300 RmiSslBootstrapTest.sh @@ -43,7 +42,7 @@ rm -rf ${TESTCLASSES}/ssl mkdir -p ${TESTCLASSES}/ssl -cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl +cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl chmod -R 777 ${TESTCLASSES}/ssl DEBUGOPTIONS="" diff --git a/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh b/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh --- a/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh +++ b/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh @@ -24,10 +24,8 @@ # # @test # @summary Test RMI Bootstrap with SSL and no keystore. +# @bug 4932854 # -# @bug 4932854 -# @modules jdk.management.agent/jdk.internal.agent -# jdk.management.agent/sun.management.jmxremote # @build TestLogger RmiSslNoKeyStoreTest # @run shell/timeout=300 RmiSslNoKeyStoreTest.sh @@ -42,7 +40,7 @@ rm -rf ${TESTCLASSES}/ssl mkdir -p ${TESTCLASSES}/ssl -cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl +cp -rf ${TESTSRC}/ssl/*store ${TESTCLASSES}/ssl chmod -R 777 ${TESTCLASSES}/ssl DEBUGOPTIONS="" diff --git a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java --- a/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java +++ b/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java @@ -25,14 +25,14 @@ /** * @test + * @bug 6557093 + * @summary Check SSL config file permission for out-of-the-box management + * @author Taras Ledkov + * * @library /lib/testlibrary - * @bug 6557093 - * @modules jdk.management.agent + * * @build jdk.testlibrary.* Dummy AbstractFilePermissionTest - * @summary Check SSL config file permission for out-of-the-box management * @run main/timeout=300 SSLConfigFilePermissionTest - * - * @author Taras Ledkov */ public class SSLConfigFilePermissionTest extends AbstractFilePermissionTest { diff --git a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java --- a/test/sun/management/jmxremote/startstop/JMXStartStopTest.java +++ b/test/sun/management/jmxremote/startstop/JMXStartStopTest.java @@ -53,13 +53,14 @@ /** * @test * @bug 7110104 + * @key randomness intermittent + * @summary Makes sure that enabling/disabling the management agent through JCMD + * achieves the desired results + * * @library /lib/testlibrary - * @modules jdk.management.agent/jdk.internal.agent + * * @build jdk.testlibrary.* JMXStartStopTest PortAllocator TestApp ManagementAgentJcmd * @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest - * @summary Makes sure that enabling/disabling the management agent through JCMD - * achieves the desired results - * @key randomness intermittent */ public class JMXStartStopTest { private static final String TEST_APP_NAME = "TestApp"; diff --git a/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java b/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java --- a/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java +++ b/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java @@ -38,11 +38,12 @@ /** * @test * @bug 8075926 + * @key intermittent * @summary Makes sure that the current management agent status is reflected * in the related performance counters. - * @key intermittent + * * @library /lib/testlibrary - * @modules jdk.management.agent/jdk.internal.agent + * * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd * @run testng/othervm -XX:+UsePerfData JMXStatusPerfCountersTest */ diff --git a/test/sun/management/jmxremote/startstop/JMXStatusTest.java b/test/sun/management/jmxremote/startstop/JMXStatusTest.java --- a/test/sun/management/jmxremote/startstop/JMXStatusTest.java +++ b/test/sun/management/jmxremote/startstop/JMXStatusTest.java @@ -37,8 +37,9 @@ * @summary Performs a sanity test for the ManagementAgent.status diagnostic command. * Management agent may be disabled, started (only local connections) and started. * The test asserts that the expected text is being printed. + * * @library /lib/testlibrary - * @modules jdk.management.agent/jdk.internal.agent + * * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd * JMXStatusTest JMXStatus1Test JMXStatus2Test * @run testng/othervm -XX:+UsePerfData JMXStatus1Test diff --git a/test/sun/tools/jcmd/TEST.properties b/test/sun/tools/jcmd/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jcmd/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.jcmd + diff --git a/test/sun/tools/jcmd/TestJcmdDefaults.java b/test/sun/tools/jcmd/TestJcmdDefaults.java --- a/test/sun/tools/jcmd/TestJcmdDefaults.java +++ b/test/sun/tools/jcmd/TestJcmdDefaults.java @@ -34,15 +34,14 @@ import jdk.testlibrary.OutputAnalyzer; import jdk.testlibrary.Utils; -/** - * Unit test for jcmd utility. Tests jcmd options which do not send - * requests to a specific JVM process. - */ /* * @test * @bug 7104647 + * @summary Unit test for jcmd utility. Tests jcmd options which do not send + * requests to a specific JVM process. + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* * @run main TestJcmdDefaults */ diff --git a/test/sun/tools/jcmd/TestJcmdSanity.java b/test/sun/tools/jcmd/TestJcmdSanity.java --- a/test/sun/tools/jcmd/TestJcmdSanity.java +++ b/test/sun/tools/jcmd/TestJcmdSanity.java @@ -35,15 +35,14 @@ import jdk.testlibrary.ProcessTools; import jdk.testlibrary.Utils; -/** - * Unit test for jcmd utility. The test will send different diagnostic command - * requests to the current java process. - */ /* * @test * @bug 7104647 7154822 + * @summary Unit test for jcmd utility. The test will send different diagnostic + * command requests to the current java process. + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* * @run main/othervm -XX:+UsePerfData TestJcmdSanity */ diff --git a/test/sun/tools/jconsole/ResourceCheckTest.java b/test/sun/tools/jconsole/ResourceCheckTest.java --- a/test/sun/tools/jconsole/ResourceCheckTest.java +++ b/test/sun/tools/jconsole/ResourceCheckTest.java @@ -22,13 +22,14 @@ */ /** + * @test + * @bug 5008856 5023573 5024917 5062569 7172176 + * @summary 'missing resource key' error for key = "Operating system" * - * @test - * @bug 5008856 5023573 5024917 5062569 7172176 - * @summary 'missing resource key' error for key = "Operating system" - * @modules jdk.jconsole/sun.tools.jconsole - * jdk.jconsole/sun.tools.jconsole.resources:open - * @run main ResourceCheckTest + * @modules jdk.jconsole/sun.tools.jconsole + * jdk.jconsole/sun.tools.jconsole.resources:open + * + * @run main ResourceCheckTest */ import java.lang.reflect.Field; diff --git a/test/sun/tools/jhsdb/BasicLauncherTest.java b/test/sun/tools/jhsdb/BasicLauncherTest.java --- a/test/sun/tools/jhsdb/BasicLauncherTest.java +++ b/test/sun/tools/jhsdb/BasicLauncherTest.java @@ -24,8 +24,10 @@ /* * @test * @summary Basic test for jhsdb launcher + * * @library /test/lib * @library /lib/testlibrary + * * @build jdk.testlibrary.* * @build jdk.test.lib.apps.* * @run main BasicLauncherTest diff --git a/test/sun/tools/jhsdb/HeapDumpTest.java b/test/sun/tools/jhsdb/HeapDumpTest.java --- a/test/sun/tools/jhsdb/HeapDumpTest.java +++ b/test/sun/tools/jhsdb/HeapDumpTest.java @@ -25,8 +25,10 @@ * @test * @bug 8163346 * @summary Test hashing of extended characters in Serviceability Agent. + * * @library /test/lib * @library /lib/testlibrary + * * @compile -encoding utf8 HeapDumpTest.java * @run main/timeout=240 HeapDumpTest */ diff --git a/test/sun/tools/jhsdb/SAGetoptTest.java b/test/sun/tools/jhsdb/SAGetoptTest.java --- a/test/sun/tools/jhsdb/SAGetoptTest.java +++ b/test/sun/tools/jhsdb/SAGetoptTest.java @@ -25,7 +25,9 @@ /* * @test * @summary unit test for SAGetopt function + * * @modules jdk.hotspot.agent/sun.jvm.hotspot + * * @compile -XDignore.symbol.file SAGetoptTest.java * @run main SAGetoptTest */ diff --git a/test/sun/tools/jhsdb/TEST.properties b/test/sun/tools/jhsdb/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jhsdb/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.hotspot.agent + diff --git a/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java b/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java --- a/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java +++ b/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java @@ -36,9 +36,11 @@ * @test * @bug 8042397 * @summary Unit test for jmap utility test heap configuration reader - * @modules jdk.hotspot.agent/sun.jvm.hotspot + * * @library /test/lib * @library /lib/testlibrary + * @modules jdk.hotspot.agent/sun.jvm.hotspot + * * @build jdk.testlibrary.* * @build jdk.test.lib.apps.* * @build JMapHeapConfigTest TmtoolTestScenario diff --git a/test/sun/tools/jinfo/BasicJInfoTest.java b/test/sun/tools/jinfo/BasicJInfoTest.java --- a/test/sun/tools/jinfo/BasicJInfoTest.java +++ b/test/sun/tools/jinfo/BasicJInfoTest.java @@ -30,7 +30,9 @@ /* * @test * @summary Unit test for jinfo utility + * * @library /lib/testlibrary + * * @build jdk.testlibrary.* * @run main BasicJInfoTest */ diff --git a/test/sun/tools/jinfo/JInfoTest.java b/test/sun/tools/jinfo/JInfoTest.java --- a/test/sun/tools/jinfo/JInfoTest.java +++ b/test/sun/tools/jinfo/JInfoTest.java @@ -36,8 +36,11 @@ /* * @test * @summary Unit test for jinfo utility + * + * @library /test/lib * @modules java.base/jdk.internal.misc - * @library /test/lib + * jdk.jcmd + * * @build jdk.test.lib.* * @build jdk.test.lib.apps.* * @build jdk.test.lib.process.* diff --git a/test/sun/tools/jinfo/TEST.properties b/test/sun/tools/jinfo/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jinfo/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.jcmd + diff --git a/test/sun/tools/jmap/BasicJMapTest.java b/test/sun/tools/jmap/BasicJMapTest.java --- a/test/sun/tools/jmap/BasicJMapTest.java +++ b/test/sun/tools/jmap/BasicJMapTest.java @@ -34,10 +34,12 @@ /* * @test + * @key intermittent * @summary Unit test for jmap utility - * @key intermittent + * * @library /lib/testlibrary * @library /test/lib + * * @build jdk.testlibrary.* * @build jdk.test.lib.hprof.* * @build jdk.test.lib.hprof.model.* diff --git a/test/sun/tools/jmap/TEST.properties b/test/sun/tools/jmap/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jmap/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.jcmd + diff --git a/test/sun/tools/jps/TestJps.java b/test/sun/tools/jps/TestJps.java --- a/test/sun/tools/jps/TestJps.java +++ b/test/sun/tools/jps/TestJps.java @@ -23,8 +23,11 @@ /* * @test + * * @library /lib/testlibrary /test/lib * @modules jdk.jartool/sun.tools.jar + * jdk.jcmd + * * @build LingeredAppForJps * @build LingeredApp * @run main/othervm TestJps diff --git a/test/sun/tools/jps/TestJpsSanity.java b/test/sun/tools/jps/TestJpsSanity.java --- a/test/sun/tools/jps/TestJpsSanity.java +++ b/test/sun/tools/jps/TestJpsSanity.java @@ -29,10 +29,13 @@ * @test * @summary This test verifies jps usage and checks that appropriate error message is shown * when running jps with illegal arguments. + * * @library /lib/testlibrary /test/lib * @modules jdk.jartool/sun.tools.jar + * java.base/jdk.internal.misc * java.management - * java.base/jdk.internal.misc + * jdk.jcmd + * * @build jdk.testlibrary.* jdk.test.lib.apps.* JpsHelper * @run driver TestJpsSanity */ diff --git a/test/sun/tools/jstack/TEST.properties b/test/sun/tools/jstack/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jstack/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.jcmd + diff --git a/test/sun/tools/jstat/JStatInterval.java b/test/sun/tools/jstat/JStatInterval.java --- a/test/sun/tools/jstat/JStatInterval.java +++ b/test/sun/tools/jstat/JStatInterval.java @@ -24,11 +24,14 @@ /** * @test * @bug 8035668 + * @summary Test checks case when target application finishes execution and jstat didn't complete work. + * jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes + * after 500ms. This shouldn't cause crash or hang in target application or in jstat. + * * @library /lib/testlibrary - * @summary Test checks case when target application finishes execution and jstat didn't complete work. - jstat is started with interval = 100 (jstat -compiler 100) and monitored application finishes - after 500ms. This shouldn't cause crash or hang in target application or in jstat. * @modules java.management + * jdk.jcmd + * * @build jdk.testlibrary.* JStatInterval * @run main JStatInterval */ diff --git a/test/sun/tools/jstat/TEST.properties b/test/sun/tools/jstat/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jstat/TEST.properties @@ -0,0 +1,2 @@ +modules = jdk.jcmd + diff --git a/test/sun/tools/jstat/jstatClassOutput1.sh b/test/sun/tools/jstat/jstatClassOutput1.sh --- a/test/sun/tools/jstat/jstatClassOutput1.sh +++ b/test/sun/tools/jstat/jstatClassOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -class 0' has expected line counts +# # @run shell jstatClassOutput1.sh -# @summary Test that output of 'jstat -class 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatClassloadOutput1.sh b/test/sun/tools/jstat/jstatClassloadOutput1.sh --- a/test/sun/tools/jstat/jstatClassloadOutput1.sh +++ b/test/sun/tools/jstat/jstatClassloadOutput1.sh @@ -22,9 +22,10 @@ # # @test -# @bug 6959965 +# @bug 6959965 +# @summary Test that output of 'jstat -classload 0' has expected line counts +# # @run shell jstatClassloadOutput1.sh -# @summary Test that output of 'jstat -classload 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatCompilerOutput1.sh b/test/sun/tools/jstat/jstatCompilerOutput1.sh --- a/test/sun/tools/jstat/jstatCompilerOutput1.sh +++ b/test/sun/tools/jstat/jstatCompilerOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -compiler 0' has expected line counts +# # @run shell jstatCompilerOutput1.sh -# @summary Test that output of 'jstat -compiler 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatFileURITest1.sh b/test/sun/tools/jstat/jstatFileURITest1.sh --- a/test/sun/tools/jstat/jstatFileURITest1.sh +++ b/test/sun/tools/jstat/jstatFileURITest1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcutil file:path' has expected line counts +# # @run shell jstatFileURITest1.sh -# @summary Test that output of 'jstat -gcutil file:path' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcCapacityOutput1.sh b/test/sun/tools/jstat/jstatGcCapacityOutput1.sh --- a/test/sun/tools/jstat/jstatGcCapacityOutput1.sh +++ b/test/sun/tools/jstat/jstatGcCapacityOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gccapacity 0' has expected line counts +# # @run shell jstatGcCapacityOutput1.sh -# @summary Test that output of 'jstat -gccapacity 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcCauseOutput1.sh b/test/sun/tools/jstat/jstatGcCauseOutput1.sh --- a/test/sun/tools/jstat/jstatGcCauseOutput1.sh +++ b/test/sun/tools/jstat/jstatGcCauseOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gccause 0' has expected line counts +# # @run shell jstatGcCauseOutput1.sh -# @summary Test that output of 'jstat -gccause 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh b/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh --- a/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh +++ b/test/sun/tools/jstat/jstatGcMetaCapacityOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcmetacapacity 0' has expected line counts +# # @run shell jstatGcMetaCapacityOutput1.sh -# @summary Test that output of 'jstat -gcmetacapacity 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh b/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh --- a/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh +++ b/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcnewcapacity 0' has expected line counts +# # @run shell jstatGcNewCapacityOutput1.sh -# @summary Test that output of 'jstat -gcnewcapacity 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcNewOutput1.sh b/test/sun/tools/jstat/jstatGcNewOutput1.sh --- a/test/sun/tools/jstat/jstatGcNewOutput1.sh +++ b/test/sun/tools/jstat/jstatGcNewOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcnew 0' has expected line counts +# # @run shell jstatGcNewOutput1.sh -# @summary Test that output of 'jstat -gcnew 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh b/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh --- a/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh +++ b/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcoldcapcaity 0' has expected line counts +# # @run shell jstatGcOldCapacityOutput1.sh -# @summary Test that output of 'jstat -gcoldcapcaity 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcOldOutput1.sh b/test/sun/tools/jstat/jstatGcOldOutput1.sh --- a/test/sun/tools/jstat/jstatGcOldOutput1.sh +++ b/test/sun/tools/jstat/jstatGcOldOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcold 0' has expected line counts +# # @run shell jstatGcOldOutput1.sh -# @summary Test that output of 'jstat -gcold 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatGcOutput1.sh b/test/sun/tools/jstat/jstatGcOutput1.sh --- a/test/sun/tools/jstat/jstatGcOutput1.sh +++ b/test/sun/tools/jstat/jstatGcOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gc 0' has expected line counts +# # @run shell jstatGcOutput1.sh -# @summary Test that output of 'jstat -gc 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatHelp.sh b/test/sun/tools/jstat/jstatHelp.sh --- a/test/sun/tools/jstat/jstatHelp.sh +++ b/test/sun/tools/jstat/jstatHelp.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 6364329 +# @summary Test that output of 'jstat -?', 'jstat -help' and 'jstat' matches the usage.out file +# # @run shell jstatHelp.sh -# @summary Test that output of 'jstat -?', 'jstat -help' and 'jstat' matches the usage.out file . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatLineCounts1.sh b/test/sun/tools/jstat/jstatLineCounts1.sh --- a/test/sun/tools/jstat/jstatLineCounts1.sh +++ b/test/sun/tools/jstat/jstatLineCounts1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcutil 0 250 5' has expected line counts +# # @run shell jstatLineCounts1.sh -# @summary Test that output of 'jstat -gcutil 0 250 5' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatLineCounts2.sh b/test/sun/tools/jstat/jstatLineCounts2.sh --- a/test/sun/tools/jstat/jstatLineCounts2.sh +++ b/test/sun/tools/jstat/jstatLineCounts2.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcutil 0' has expected line counts +# # @run shell jstatLineCounts2.sh -# @summary Test that output of 'jstat -gcutil 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatLineCounts3.sh b/test/sun/tools/jstat/jstatLineCounts3.sh --- a/test/sun/tools/jstat/jstatLineCounts3.sh +++ b/test/sun/tools/jstat/jstatLineCounts3.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcutil -h 10 250 10' has expected line counts +# # @run shell jstatLineCounts3.sh -# @summary Test that output of 'jstat -gcutil -h 10 250 10' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatOptions1.sh b/test/sun/tools/jstat/jstatOptions1.sh --- a/test/sun/tools/jstat/jstatOptions1.sh +++ b/test/sun/tools/jstat/jstatOptions1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -options matches the usage.out file +# # @run shell jstatOptions1.sh -# @summary Test that output of 'jstat -options matches the usage.out file . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh b/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh --- a/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh +++ b/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -printcompilation 0' has expected line counts +# # @run shell jstatPrintCompilationOutput1.sh -# @summary Test that output of 'jstat -printcompilation 0' has expected line counts . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatSnap2.sh b/test/sun/tools/jstat/jstatSnap2.sh --- a/test/sun/tools/jstat/jstatSnap2.sh +++ b/test/sun/tools/jstat/jstatSnap2.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -J-Djstat.showUnsupported -snap' matches a specific pattern +# # @run shell jstatSnap2.sh -# @summary Test that output of 'jstat -J-Djstat.showUnsupported -snap' matches a specific pattern . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstat/jstatTimeStamp1.sh b/test/sun/tools/jstat/jstatTimeStamp1.sh --- a/test/sun/tools/jstat/jstatTimeStamp1.sh +++ b/test/sun/tools/jstat/jstatTimeStamp1.sh @@ -23,8 +23,9 @@ # @test # @bug 4990825 +# @summary Test that output of 'jstat -gcutil -t 0' has expected format +# # @run shell jstatTimeStamp1.sh -# @summary Test that output of 'jstat -gcutil -t 0' has expected format . ${TESTSRC-.}/../../jvmstat/testlibrary/utils.sh diff --git a/test/sun/tools/jstatd/TEST.properties b/test/sun/tools/jstatd/TEST.properties new file mode 100644 --- /dev/null +++ b/test/sun/tools/jstatd/TEST.properties @@ -0,0 +1,4 @@ +modules = java.management \ + jdk.jcmd \ + jdk.jstatd + diff --git a/test/sun/tools/jstatd/TestJstatdDefaults.java b/test/sun/tools/jstatd/TestJstatdDefaults.java --- a/test/sun/tools/jstatd/TestJstatdDefaults.java +++ b/test/sun/tools/jstatd/TestJstatdDefaults.java @@ -25,8 +25,9 @@ * @test * @bug 4990825 * @key intermittent + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdDefaults */ diff --git a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java --- a/test/sun/tools/jstatd/TestJstatdExternalRegistry.java +++ b/test/sun/tools/jstatd/TestJstatdExternalRegistry.java @@ -25,8 +25,9 @@ * @test * @bug 4990825 7092186 * @key intermittent + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdExternalRegistry */ diff --git a/test/sun/tools/jstatd/TestJstatdPort.java b/test/sun/tools/jstatd/TestJstatdPort.java --- a/test/sun/tools/jstatd/TestJstatdPort.java +++ b/test/sun/tools/jstatd/TestJstatdPort.java @@ -25,8 +25,9 @@ * @test * @bug 4990825 * @key intermittent + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPort */ diff --git a/test/sun/tools/jstatd/TestJstatdPortAndServer.java b/test/sun/tools/jstatd/TestJstatdPortAndServer.java --- a/test/sun/tools/jstatd/TestJstatdPortAndServer.java +++ b/test/sun/tools/jstatd/TestJstatdPortAndServer.java @@ -25,8 +25,9 @@ * @test * @bug 4990825 * @key intermittent + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdPortAndServer */ diff --git a/test/sun/tools/jstatd/TestJstatdServer.java b/test/sun/tools/jstatd/TestJstatdServer.java --- a/test/sun/tools/jstatd/TestJstatdServer.java +++ b/test/sun/tools/jstatd/TestJstatdServer.java @@ -25,8 +25,9 @@ * @test * @bug 4990825 * @key intermittent + * * @library /lib/testlibrary - * @modules java.management + * * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser * @run main/timeout=60 TestJstatdServer */ diff --git a/test/sun/tools/jstatd/TestJstatdUsage.java b/test/sun/tools/jstatd/TestJstatdUsage.java --- a/test/sun/tools/jstatd/TestJstatdUsage.java +++ b/test/sun/tools/jstatd/TestJstatdUsage.java @@ -28,8 +28,11 @@ /* * @test * @bug 4990825 + * * @library /lib/testlibrary * @modules java.management + * jdk.jstatd + * * @build jdk.testlibrary.* * @run main TestJstatdUsage */