OpenJDK / amber / amber
changeset 44427:a053dcc2d986
Merge
| author | jwilhelm |
|---|---|
| date | Sat, 25 Mar 2017 00:31:29 +0100 |
| parents | 588e52811bf4 a2576b79369d |
| children | e8db842f5496 |
| files | |
| diffstat | 456 files changed, 1333 insertions(+), 1450 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/common/ProcessArgumentMatcher.java Sat Mar 25 00:31:29 2017 +0100 @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; import com.sun.tools.attach.VirtualMachine; import com.sun.tools.attach.VirtualMachineDescriptor; @@ -145,4 +146,17 @@ return this.getVirtualMachineDescriptors(null); } + public Collection<String> getVirtualMachinePids(Class<?> excludeClass) { + if (singlePid != null) { + // There is a bug in AttachProvider, when VM is debuggee-suspended it's not listed by the AttachProvider. + // If we are talking about a specific pid, just return it. + return List.of(singlePid); + } else { + return getVMDs(excludeClass, matchClass).stream().map(x -> {return x.id();}).collect(Collectors.toList()); + } + } + + public Collection<String> getVirtualMachinePids() { + return this.getVirtualMachinePids(null); + } }
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd/JCmd.java Sat Mar 25 00:31:29 2017 +0100 @@ -80,22 +80,22 @@ System.exit(0); } - Collection<VirtualMachineDescriptor> vids = ap.getVirtualMachineDescriptors(JCmd.class); + Collection<String> pids = ap.getVirtualMachinePids(JCmd.class); - if (vids.isEmpty()) { + if (pids.isEmpty()) { System.err.println("Could not find any processes matching : '" + arg.getProcessString() + "'"); System.exit(1); } boolean success = true; - for (VirtualMachineDescriptor vid : vids) { - System.out.println(vid.id() + ":"); + for (String pid : pids) { + System.out.println(pid + ":"); if (arg.isListCounters()) { - listCounters(vid.id()); + listCounters(pid); } else { try { - executeCommandForPid(vid.id(), arg.getCommand()); + executeCommandForPid(pid, arg.getCommand()); } catch(AttachOperationFailedException ex) { System.err.println(ex.getMessage()); success = false;
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo/JInfo.java Sat Mar 25 00:31:29 2017 +0100 @@ -96,37 +96,37 @@ String parg = args[optionCount]; ProcessArgumentMatcher ap = new ProcessArgumentMatcher(parg); - Collection<VirtualMachineDescriptor> vids = ap.getVirtualMachineDescriptors(JInfo.class); + Collection<String> pids = ap.getVirtualMachinePids(JInfo.class); - if (vids.isEmpty()) { + if (pids.isEmpty()) { System.err.println("Could not find any processes matching : '" + parg + "'"); System.exit(1); } - for (VirtualMachineDescriptor vid : vids) { - if (vids.size() > 1) { - System.out.println("Pid:" + vid.id()); + for (String pid : pids) { + if (pids.size() > 1) { + System.out.println("Pid:" + pid); } if (!doFlag && !doFlags && !doSysprops) { // Print flags and sysporps if no options given - sysprops(vid.id()); + sysprops(pid); System.out.println(); - flags(vid.id()); + flags(pid); System.out.println(); - commandLine(vid.id()); + commandLine(pid); } if (doFlag) { if (flag < 0) { System.err.println("Missing flag"); usage(1); } - flag(vid.id(), args[flag]); + flag(pid, args[flag]); } if (doFlags) { - flags(vid.id()); + flags(pid); } if (doSysprops) { - sysprops(vid.id()); + sysprops(pid); } } }
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jmap/JMap.java Sat Mar 25 00:31:29 2017 +0100 @@ -91,16 +91,15 @@ // As more options are added we should create an abstract tool class and // have a table to map the options ProcessArgumentMatcher ap = new ProcessArgumentMatcher(pidArg); - Collection<VirtualMachineDescriptor> vids = ap.getVirtualMachineDescriptors(JMap.class); + Collection<String> pids = ap.getVirtualMachinePids(JMap.class); - if (vids.isEmpty()) { + if (pids.isEmpty()) { System.err.println("Could not find any processes matching : '" + pidArg + "'"); System.exit(1); } - for (VirtualMachineDescriptor vid : vids) { - String pid = vid.id(); - if (vids.size() > 1) { + for (String pid : pids) { + if (pids.size() > 1) { System.out.println("Pid:" + pid); } if (option.equals("-histo")) {
--- a/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/src/jdk.jcmd/share/classes/sun/tools/jstack/JStack.java Sat Mar 25 00:31:29 2017 +0100 @@ -84,18 +84,18 @@ params = new String[0]; } ProcessArgumentMatcher ap = new ProcessArgumentMatcher(pidArg); - Collection<VirtualMachineDescriptor> vids = ap.getVirtualMachineDescriptors(JStack.class); + Collection<String> pids = ap.getVirtualMachinePids(JStack.class); - if (vids.isEmpty()) { + if (pids.isEmpty()) { System.err.println("Could not find any processes matching : '" + pidArg + "'"); System.exit(1); } - for (VirtualMachineDescriptor vid : vids) { - if (vids.size() > 1) { - System.out.println("Pid:" + vid.id()); + for (String pid : pids) { + if (pids.size() > 1) { + System.out.println("Pid:" + pid); } - runThreadDump(vid.id(), params); + runThreadDump(pid, params); } }
--- a/jdk/test/com/sun/jdi/AcceptTimeout.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/AcceptTimeout.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/AccessSpecifierTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/AccessSpecifierTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/AfterThreadDeathTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/AfterThreadDeathTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/AllLineLocations.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/AllLineLocations.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ArrayRangeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ArrayRangeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/BacktraceFieldTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/BacktraceFieldTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/com/sun/jdi/ClassesByName.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ClassesByName.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ClassesByName2Test.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ClassesByName2Test.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,17 @@ */ /** - * @test - * @bug 4406439 4925740 - * @summary ClassesByName2 verifies that all the classes in the loaded class list can be found with classesByName.. + * @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) * - * @author Tim Bell (based on ClassesByName by Robert Field) + * @modules jdk.jdi + * java.desktop * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ClassesByName2Test.java - * @run driver ClassesByName2Test + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ClassesByName2Test.java + * @run driver ClassesByName2Test */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/CompatibleConnectors.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/CompatibleConnectors.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ConnectedVMs.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ConnectedVMs.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ConstantPoolInfo.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ConstantPoolInfo.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ConstantPoolInfoGC.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ConstantPoolInfoGC.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/CountEvent.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/CountEvent.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/CountFilterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/CountFilterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/DebuggerThreadTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/DebuggerThreadTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4528948 - * @summary Unable to finish a debugging in NetBeans IDE - * - * @author jjh + * @test + * @bug 4528948 + * @summary Unable to finish a debugging in NetBeans IDE + * @author jjh * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g DeleteAllBkptsTest.java - * @run driver DeleteAllBkptsTest + * @library .. + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g DeleteAllBkptsTest.java + * @run driver DeleteAllBkptsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/EarlyReturnTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/EarlyReturnTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 - * - * @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund) + * @bug 6432855 + * @summary Need a way to create JDI VoidValue for use in ThreadReference.forceEarlyReturn * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g EarlyReturnTest.java - * @run driver EarlyReturnTest + * @author Tim Bell (based on MethodExitReturnValuesTest by Jim Holmlund) + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g EarlyReturnTest.java + * @run driver EarlyReturnTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/EnumTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/EnumTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ExceptionEvents.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ExceptionEvents.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,43 +22,41 @@ */ /** - * @test - * @bug 4407397 - * @summary Test the requesting of exception events - * - * @author Robert Field + * @test + * @bug 4407397 + * @key intermittent + * @summary Test the requesting of exception events + * @author Robert Field * - * @key intermittent - * @modules jdk.jdi - * @run build TestScaffold VMConnection - * @run compile -g ExceptionEvents.java + * @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.*;
--- a/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/FieldWatchpoints.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FieldWatchpoints.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/FilterMatch.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FilterMatch.java Sat Mar 25 00:31:29 2017 +0100 @@ -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:
--- a/jdk/test/com/sun/jdi/FilterNoMatch.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FilterNoMatch.java Sat Mar 25 00:31:29 2017 +0100 @@ -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:
--- a/jdk/test/com/sun/jdi/FinalLocalsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FinalLocalsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/FinalizerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FinalizerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/FramesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/FramesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/GenericsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/GenericsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/GetLocalVariables2Test.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/GetLocalVariables2Test.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/GetUninitializedStringValue.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/GetUninitializedStringValue.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/HomeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/HomeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ImmutableResourceTest.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Mar 25 00:31:29 2017 +0100 @@ -21,13 +21,15 @@ # 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 # +# @modules jdk.jdi/com.sun.tools.example.debug.tty +# +# @run shell ImmutableResourceTest.sh # # Beginning of subroutines:
--- a/jdk/test/com/sun/jdi/InstanceFilter.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InstanceFilter.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/InstancesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InstancesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/com/sun/jdi/InterfaceMethodsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InterfaceMethodsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/InterruptHangTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InterruptHangTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /**
--- a/jdk/test/com/sun/jdi/InvokeHangTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InvokeHangTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,18 @@ */ /** - * @test - * @bug 6293795 - * @summary Backend hangs when invokeMethod is called from a JDI eventHandler - * - * @author jjh + * @test + * @bug 6293795 + * @summary Backend hangs when invokeMethod is called from a JDI eventHandler + * @author jjh * - * @modules jdk.jdi - * @library /test/lib - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InvokeHangTest.java - * @run driver InvokeHangTest + * @library /test/lib + * @modules java.management + * jdk.jdi + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InvokeHangTest.java + * @run driver InvokeHangTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/InvokeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/InvokeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,16 @@ */ /** - * @test - * @bug 4451941 4527072 - * @summary Test argument types for invoke - * - * @author Robert Field + * @test + * @bug 4451941 4527072 + * @summary Test argument types for invoke + * @author Robert Field * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g InvokeTest.java - * @run driver InvokeTest + * @library .. + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g InvokeTest.java + * @run driver InvokeTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/JITDebug.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/JITDebug.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/com/sun/jdi/Java_gTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/Java_gTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/LambdaStepTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/LambdaStepTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,15 +22,13 @@ */ /** - * @test - * @summary Test stepping through lambdas - * - * @author Staffan Larsen + * @test + * @summary Test stepping through lambdas + * @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;
--- a/jdk/test/com/sun/jdi/LaunchCommandLine.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/LaunchCommandLine.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/LineNumberInfo.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/LineNumberInfo.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 *
--- a/jdk/test/com/sun/jdi/ListenAddress.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ListenAddress.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/LocalVariableEqual.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/LocalVariableEqual.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/LocationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/LocationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MethodEntryExitEvents.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MethodEntryExitEvents.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MixedSuspendTest.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MixedSuspendTest.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/com/sun/jdi/ModificationWatchpoints.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ModificationWatchpoints.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/ModulesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ModulesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MonitorEventTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MonitorEventTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MonitorFrameInfo.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MonitorFrameInfo.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/MultiBreakpointsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/MultiBreakpointsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/com/sun/jdi/NativeInstanceFilter.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/NativeInstanceFilter.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/com/sun/jdi/NewInstanceTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/NewInstanceTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/NoLaunchOptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/NoLaunchOptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/com/sun/jdi/NoLocInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/NoLocInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/NullThreadGroupNameTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/OnThrowTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/OnThrowTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/OptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/OptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/com/sun/jdi/PopAndInvokeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/PopAndInvokeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/PopAsynchronousTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/PopAsynchronousTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/PopSynchronousTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/PopSynchronousTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/com/sun/jdi/RedefineCrossEvent.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/RedefineCrossEvent.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/com/sun/jdi/RedefineCrossStart.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/RedefineCrossStart.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/com/sun/jdi/ReferrersTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ReferrersTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,15 +22,14 @@ */ /** - * @test - * @bug 5089849 - * @summary Add support for backtracking reference graph. - * @author jjh + * @test + * @bug 5089849 + * @summary Add support for backtracking reference graph. + * @author jjh * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ReferrersTest.java - * @run driver ReferrersTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ReferrersTest.java + * @run driver ReferrersTest */ /*
--- a/jdk/test/com/sun/jdi/RepStep.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/RepStep.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,18 +22,16 @@ */ /** - * @test - * @bug 4334008 - * @author Robert Field - * - * @modules jdk.jdi - * @run compile -g RepStepTarg.java - * @run build VMConnection RepStep - * - * @run driver RepStep - * + * @test + * @bug 4334008 * @summary RepStep detects missed step events due to lack of * frame pop events (in back-end). + * @author Robert Field + * + * @run compile -g RepStepTarg.java + * @run build VMConnection RepStep + * + * @run driver RepStep */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/RequestReflectionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/RequestReflectionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4425840 - * @author Robert Field + * @test + * @bug 4425840 + * @summary RequestReflectionTest checks to see that reflective + * accessors on EventRequests return what they are given. + * @author Robert Field * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g RequestReflectionTest.java - * @run driver RequestReflectionTest - * - * @summary RequestReflectionTest checks to see that reflective - * accessors on EventRequests return what they are given. + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g RequestReflectionTest.java + * @run driver RequestReflectionTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/ResumeOneThreadTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ResumeOneThreadTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 6700889 - * @summary Thread resume invalidates all stack frames, even from other threads + * @test + * @bug 6700889 + * @summary Thread resume invalidates all stack frames, even from other threads + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g ResumeOneThreadTest.java - * @run driver ResumeOneThreadTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g ResumeOneThreadTest.java + * @run driver ResumeOneThreadTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/SDENullTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/SDENullTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,15 @@ */ /** - * @test - * @bug 4621289 - * @summary vm.setDefaultStratum(null) causes a Null Ptr exception + * @test + * @bug 4621289 + * @summary vm.setDefaultStratum(null) causes a Null Ptr exception * - * @author jjh + * @author jjh * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g SDENullTest.java - * @run driver SDENullTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g SDENullTest.java + * @run driver SDENullTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/SimulResumerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/SimulResumerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 6751643 - * @summary ThreadReference.ownedMonitors() can return null - * - * @author jjh + * @test + * @bug 6751643 + * @key intermittent + * @summary ThreadReference.ownedMonitors() can return null + * @author jjh * - * @key intermittent - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g SimulResumerTest.java - * @run driver SimulResumerTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g SimulResumerTest.java + * @run driver SimulResumerTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/SourceNameFilterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/SourceNameFilterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,18 +22,16 @@ */ /** - * @test - * @bug 4836939 6646613 - * @summary JDI add addSourceNameFilter to ClassPrepareRequest - * - * @author jjh + * @test + * @bug 4836939 6646613 + * @summary JDI add addSourceNameFilter to ClassPrepareRequest + * @author jjh * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g SourceNameFilterTest.java - * @run driver SourceNameFilterTest - * @run compile -g:none SourceNameFilterTest.java - * @run driver SourceNameFilterTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g SourceNameFilterTest.java + * @run driver SourceNameFilterTest + * @run compile -g:none SourceNameFilterTest.java + * @run driver SourceNameFilterTest */ // The compile -g:none suppresses the lineNumber table to trigger bug 6646613.
--- a/jdk/test/com/sun/jdi/StepTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/StepTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,15 @@ */ /** - * @test - * @bug 4270488 4787861 - * @author Gordon Hirsch + * @test + * @bug 4270488 4787861 + * @author Gordon Hirsch * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetAdapter TargetListener - * @run compile -g MethodCalls.java - * @run compile -g MethodCallsReflection.java - * @run compile -g ControlFlow.java - * @run build StepTest + * @run build TestScaffold VMConnection TargetAdapter TargetListener + * @run compile -g MethodCalls.java + * @run compile -g MethodCallsReflection.java + * @run compile -g ControlFlow.java + * @run build StepTest * * @summary StepTest starts at a method named "go()" in the debuggee and * repetitively steps. It will do a step into until the maximum @@ -46,21 +45,21 @@ * for the debuggee files- MethodCalls.java, ... * See LineNumberInfo.java for more info. * - * +--- maximum stack depth in debuggee - * | +--- step granularity: "line" or "min" - * | | +---Expected number of steps - * | | | +--- Debuggee command Line - * V V V V Workaround-----+ - * V - * @run driver StepTest 2 line 2 MethodCalls - * @run driver StepTest 3 line 14 MethodCalls + * +--- maximum stack depth in debuggee + * | +--- step granularity: "line" or "min" + * | | +---Expected number of steps + * | | | +--- Debuggee command Line + * V V V V Workaround-----+ + * V + * @run driver StepTest 2 line 2 MethodCalls + * @run driver StepTest 3 line 14 MethodCalls * - * @run driver StepTest 2 line 18 MethodCallsReflection 12 + * @run driver StepTest 2 line 18 MethodCallsReflection 12 * - * @run driver StepTest 2 min 4 MethodCalls - * @run driver StepTest 3 min 43 MethodCalls + * @run driver StepTest 2 min 4 MethodCalls + * @run driver StepTest 3 min 43 MethodCalls * - * @run driver StepTest 2 line 65 ControlFlow 64 + * @run driver StepTest 2 line 65 ControlFlow 64 */ /*
--- a/jdk/test/com/sun/jdi/SuspendThreadTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/SuspendThreadTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 6485605 - * @summary com.sun.jdi.InternalException: Inconsistent suspend policy in internal event handler + * @test + * @bug 6485605 + * @summary com.sun.jdi.InternalException: Inconsistent suspend policy in internal event handler + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g SuspendThreadTest.java - * @run driver SuspendThreadTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g SuspendThreadTest.java + * @run driver SuspendThreadTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/jdi/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jdi +
--- a/jdk/test/com/sun/jdi/TemplateTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/TemplateTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -25,16 +25,14 @@ // TEMPLATE: change bug number and fill out <SUMMARY> and <AUTHOR> // TEMPLATE: delete TEMPLATE lines /** - * @test - * @bug 0000000 - * @summary <SUMMARY> + * @test + * @bug 0000000 + * @summary <SUMMARY> + * @author <AUTHOR> * - * @author <AUTHOR> - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g TemplateTest.java - * @run driver TemplateTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g TemplateTest.java + * @run driver TemplateTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/ThreadGroupTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/ThreadGroupTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,15 @@ */ /** - * @test - * @bug 4893530 - * @summary If JDI is initially started from a thread group that is subsequently - * destroyed this should not impact subsequent thread creation by - * the virtual machine manager. + * @test + * @bug 4893530 + * @summary If JDI is initially started from a thread group that is subsequently + * destroyed this should not impact subsequent thread creation by + * the virtual machine manager. * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile ThreadGroupTest.java - * @run driver ThreadGroupTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile ThreadGroupTest.java + * @run driver ThreadGroupTest */ import com.sun.jdi.*; import com.sun.jdi.connect.*;
--- a/jdk/test/com/sun/jdi/TwoThreadsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/TwoThreadsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 6296125 - * @summary JDI: Disabling an EventRequest can cause a multi-threaded debuggee to hang + * @test + * @bug 6296125 + * @summary JDI: Disabling an EventRequest can cause a multi-threaded debuggee to hang + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g TwoThreadsTest.java - * @run driver TwoThreadsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g TwoThreadsTest.java + * @run driver TwoThreadsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/UTF8Test.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/UTF8Test.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 5033550 - * @summary JDWP back end uses modified UTF-8 + * @test + * @bug 5033550 + * @summary JDWP back end uses modified UTF-8 + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g UTF8Test.java - * @run driver UTF8Test + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g UTF8Test.java + * @run driver UTF8Test */ /*
--- a/jdk/test/com/sun/jdi/UnpreparedByName.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/UnpreparedByName.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,18 +22,17 @@ */ /** - * @test - * @bug 4368402 - * @summary UnpreparedByName verifies that unprepared classes - * won't be returned by classesByName. - * @author Robert Field + * @test + * @bug 4368402 + * @summary UnpreparedByName verifies that unprepared classes + * won't be returned by classesByName. + * @author Robert Field * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g InnerTarg.java - * @run build UnpreparedByName + * @run build JDIScaffold VMConnection + * @run compile -g InnerTarg.java + * @run build UnpreparedByName * - * @run driver UnpreparedByName InnerTarg + * @run driver UnpreparedByName InnerTarg */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/UnpreparedClasses.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/UnpreparedClasses.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,18 +22,17 @@ */ /** - * @test - * @bug 4368402 - * @summary UnpreparedClasses verifies that all the classes in the - * loaded class list are prepared classes. - * @author Robert Field + * @test + * @bug 4368402 + * @summary UnpreparedClasses verifies that all the classes in the + * loaded class list are prepared classes. + * @author Robert Field * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g InnerTarg.java - * @run build UnpreparedClasses + * @run build JDIScaffold VMConnection + * @run compile -g InnerTarg.java + * @run build UnpreparedClasses * - * @run driver UnpreparedClasses InnerTarg + * @run driver UnpreparedClasses InnerTarg */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/VMDeathLastTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/VMDeathLastTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,17 +22,15 @@ */ /** - * @test - * @bug 4420844 4449394 - * @summary Checks that no events are sent after VMDeath, and test vm.canBeModified - * - * @author Robert Field + * @test + * @bug 4420844 4449394 + * @summary Checks that no events are sent after VMDeath, and test vm.canBeModified + * @author Robert Field * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g HelloWorld.java - * @run build VMDeathLastTest - * @run driver VMDeathLastTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g HelloWorld.java + * @run build VMDeathLastTest + * @run driver VMDeathLastTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/VMDeathRequestTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/VMDeathRequestTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,22 +22,20 @@ */ /** - * @test - * @bug 4419314 - * @author Robert Field - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g HelloWorld.java - * @run build VMDeathRequestTest - * @run driver VMDeathRequestTest - * + * @test + * @bug 4419314 * @summary VMDeathRequestTest 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. + * @author Robert Field + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g HelloWorld.java + * @run build VMDeathRequestTest + * @run driver VMDeathRequestTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/VarargsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/VarargsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @bug 4870984 - * @summary JPDA: Add support for RFE 4856541 - varargs + * @test + * @bug 4870984 + * @summary JPDA: Add support for RFE 4856541 - varargs + * @author jjh * - * @author jjh - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g VarargsTest.java - * @run driver VarargsTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g VarargsTest.java + * @run driver VarargsTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/Vars.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/Vars.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,15 +22,13 @@ */ /** - * @test - * @summary Test Method.variables() and the like. - * - * @author Robert Field + * @test + * @summary Test Method.variables() and the like. + * @author Robert Field * - * @modules jdk.jdi - * @run build JDIScaffold VMConnection - * @run compile -g Vars.java - * @run driver Vars + * @run build JDIScaffold VMConnection + * @run compile -g Vars.java + * @run driver Vars */ import com.sun.jdi.*;
--- a/jdk/test/com/sun/jdi/VisibleMethods.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/VisibleMethods.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,16 +22,14 @@ */ /** - * @test - * @summary Test ReferenceType.visibleMethods - * @bug 8028430 + * @test + * @summary Test ReferenceType.visibleMethods + * @bug 8028430 + * @author Staffan Larsen * - * @author Staffan Larsen - * - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g VisibleMethods.java - * @run driver VisibleMethods + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g VisibleMethods.java + * @run driver VisibleMethods */ import com.sun.jdi.Method; import com.sun.jdi.ReferenceType;
--- a/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java Sat Mar 25 00:31:29 2017 +0100 @@ -30,7 +30,6 @@ * to encapsulate the transport. This tests that the connectors are * created and that they have an "address" argument. * - * @modules jdk.jdi/com.sun.tools.jdi * @build GeneratedConnectors NullTransportService SimpleLaunchingConnector * @run main/othervm GeneratedConnectors */
--- a/jdk/test/com/sun/jdi/redefine/RedefineTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/redefine/RedefineTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,20 +22,20 @@ */ /** - * @test - * @bug 4287595 - * @bug 4462989 - * @bug 4531511 - * @summary Test class redefinition + * @test + * @bug 4287595 + * @bug 4462989 + * @bug 4531511 + * @summary Test class redefinition * - * @author Robert Field + * @author Robert Field + * + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g RedefineTest.java - * @run shell RedefineSetUp.sh - * @run driver RedefineTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g RedefineTest.java + * @run shell RedefineSetUp.sh + * @run driver RedefineTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/redefineMethod/RedefineTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -22,19 +22,18 @@ */ /** - * @test - * @bug 4628726 - * @summary Test class redefinition - method data line numbers and local vars, - * - * @author Robert Field + * @test + * @bug 4628726 + * @summary Test class redefinition - method data line numbers and local vars, + * @author Robert Field * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter - * @run compile -g RedefineTest.java - * @run shell RedefineSetUp.sh - * @run driver RedefineTest -repeat 3 - * @run driver RedefineTest + * @library .. + * + * @run build TestScaffold VMConnection TargetListener TargetAdapter + * @run compile -g RedefineTest.java + * @run shell RedefineSetUp.sh + * @run driver RedefineTest -repeat 3 + * @run driver RedefineTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/sde/FilterMangleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/sde/FilterMangleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -1,31 +1,30 @@ /** - * @test - * @bug 4836939 - * @summary JDI add addSourceNameFilter to ClassPrepareRequest + * @test + * @bug 4836939 + * @key intermittent + * @summary JDI add addSourceNameFilter to ClassPrepareRequest + * @author Robert Field / Jim Holmlund * - * @author Robert Field / Jim Holmlund + * @library .. * - * @key intermittent - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE - * @run compile FilterMangleTest.java - * @run compile -g onion/pickle/Mangle.java - * @run driver FilterMangleTest - * @run driver FilterMangleTest SDE-pMangle.java* - * @run driver FilterMangleTest SDE-pMangle.jav* - * @run driver FilterMangleTest SDE-pMangle.j* - * @run driver FilterMangleTest SDE-p*Mangle.java - * @run driver FilterMangleTest SDE-p*angle.java - * @run driver FilterMangleTest SDE-p*java - * @run driver FilterMangleTest SDE-pMangle.xyz - * @run driver FilterMangleTest SDE-pIncl.rats* - * @run driver FilterMangleTest SDE-pIncl.rat* - * @run driver FilterMangleTest SDE-p*angle.rats - * @run driver FilterMangleTest SDE-f*Incl.rat - * @run driver FilterMangleTest SDE-ffred - * @run driver FilterMangleTest SDE-f*ratsx - * @run driver FilterMangleTest SDE-fMangle.javax* + * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE + * @run compile FilterMangleTest.java + * @run compile -g onion/pickle/Mangle.java + * @run driver FilterMangleTest + * @run driver FilterMangleTest SDE-pMangle.java* + * @run driver FilterMangleTest SDE-pMangle.jav* + * @run driver FilterMangleTest SDE-pMangle.j* + * @run driver FilterMangleTest SDE-p*Mangle.java + * @run driver FilterMangleTest SDE-p*angle.java + * @run driver FilterMangleTest SDE-p*java + * @run driver FilterMangleTest SDE-pMangle.xyz + * @run driver FilterMangleTest SDE-pIncl.rats* + * @run driver FilterMangleTest SDE-pIncl.rat* + * @run driver FilterMangleTest SDE-p*angle.rats + * @run driver FilterMangleTest SDE-f*Incl.rat + * @run driver FilterMangleTest SDE-ffred + * @run driver FilterMangleTest SDE-f*ratsx + * @run driver FilterMangleTest SDE-fMangle.javax* */ /*
--- a/jdk/test/com/sun/jdi/sde/MangleStepTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/sde/MangleStepTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -1,21 +1,20 @@ /** - * @test - * @bug 4390869 - * @bug 4460328 - * @summary Test Stepping in the new SourceDebugExtension facility + * @test + * @bug 4390869 + * @bug 4460328 + * @summary Test Stepping in the new SourceDebugExtension facility + * @author Robert Field * - * @author Robert Field + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE - * @run compile MangleStepTest.java - * @run compile -g onion/pickle/Mangle.java - * @run driver MangleStepTest unset - * @run driver MangleStepTest Java - * @run driver MangleStepTest XYZ - * @run driver MangleStepTest Rats - * @run driver MangleStepTest bogus + * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE + * @run compile MangleStepTest.java + * @run compile -g onion/pickle/Mangle.java + * @run driver MangleStepTest unset + * @run driver MangleStepTest Java + * @run driver MangleStepTest XYZ + * @run driver MangleStepTest Rats + * @run driver MangleStepTest bogus */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/sde/MangleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/sde/MangleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -1,17 +1,16 @@ /** - * @test - * @bug 4390869 - * @bug 4460328 - * @summary Test the new SourceDebugExtension facility + * @test + * @bug 4390869 + * @bug 4460328 + * @summary Test the new SourceDebugExtension facility + * @author Robert Field * - * @author Robert Field + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE - * @run compile MangleTest.java - * @run compile -g onion/pickle/Mangle.java - * @run driver MangleTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE + * @run compile MangleTest.java + * @run compile -g onion/pickle/Mangle.java + * @run driver MangleTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/sde/SourceDebugExtensionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -1,17 +1,16 @@ /** - * @test - * @bug 4390869 - * @bug 4460328 - * @summary Test the new SourceDebugExtension facility + * @test + * @bug 4390869 + * @bug 4460328 + * @summary Test the new SourceDebugExtension facility + * @author Robert Field * - * @author Robert Field + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE - * @run compile SourceDebugExtensionTest.java - * @run compile -g SourceDebugExtensionTarg.java - * @run driver SourceDebugExtensionTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE + * @run compile SourceDebugExtensionTest.java + * @run compile -g SourceDebugExtensionTarg.java + * @run driver SourceDebugExtensionTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/jdi/sde/TemperatureTableTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/jdi/sde/TemperatureTableTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -1,17 +1,16 @@ /** - * @test - * @bug 4390869 - * @bug 4460328 - * @summary Test the new SourceDebugExtension facility + * @test + * @bug 4390869 + * @bug 4460328 + * @summary Test the new SourceDebugExtension facility + * @author Robert Field * - * @author Robert Field + * @library .. * - * @library .. - * @modules jdk.jdi - * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE HelloWorld - * @run compile TemperatureTableTest.java - * @run compile -g TemperatureTableServlet.java - * @run driver TemperatureTableTest + * @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE HelloWorld + * @run compile TemperatureTableTest.java + * @run compile -g TemperatureTableServlet.java + * @run driver TemperatureTableTest */ import com.sun.jdi.*; import com.sun.jdi.event.*;
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for the DiagnosticCommandMBean * @author Frederic Parain, Shanliang JIANG * - * @modules jdk.management * @run main/othervm DcmdMBeanDoubleInvocationTest */
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for the DiagnosticCommandMBean * @author Frederic Parain, Shanliang JIANG * - * @modules jdk.management * @run main/othervm DcmdMBeanInvocationTest */
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,9 @@ * @summary Permissions Tests for the DiagnosticCommandMBean * @author Frederic Parain * - * @modules jdk.management + * @modules java.logging + * java.management + * * @run main/othervm DcmdMBeanPermissionsTest */
--- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for the DiagnosticCommandMBean * @author Frederic Parain, Shanliang JIANG * - * @modules jdk.management * @run main/othervm DcmdMBeanTest */
--- a/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/GarbageCollectorMXBean/LastGCInfo.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Sanity Test for GarbageCollectorMXBean.getLastGcInfo(). * @author Mandy Chung * - * @modules jdk.management * @run main/othervm -XX:-ExplicitGCInvokesConcurrent LastGCInfo */ // Passing "-XX:-ExplicitGCInvokesConcurrent" to force System.gc()
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticOptions() * @author Daniel Fuchs * - * @modules jdk.management * @run main GetDiagnosticOptions */
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDoubleVMOption.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for HotSpotDiagnosticMXBean.getVMOption() and double values * @author Jaroslav Bachorik * - * @modules jdk.management * @run main/othervm -XX:CompileThresholdScaling=0.14 GetDoubleVMOption */
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for HotSpotDiagnosticMXBean.getVMOption() * @author Mandy Chung * - * @modules jdk.management * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError GetVMOption */
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic Test for HotSpotDiagnosticMXBean.setVMOption() * @author Tomas Hurka, Daniel Fuchs * - * @modules jdk.management * @run main SetAllVMOptions */
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/SetVMOption.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * @author Mandy Chung * @author Jaroslav Bachorik * - * @modules jdk.management * @run main/othervm -XX:+HeapDumpOnOutOfMemoryError SetVMOption */
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4858522 6191542 * @summary Basic unit test of OperatingSystemMXBean.getCommittedVirtualMemorySize() * @author Steve Bohne - * @modules jdk.management */ /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4858522 * @summary Basic unit test of OperatingSystemMXBean.getFreePhysicalMemorySize() * @author Steve Bohne - * @modules jdk.management */ /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4858522 * @summary Basic unit test of OperatingSystemMXBean.getFreeSwapSpaceSize() * @author Steve Bohne - * @modules jdk.management */ /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 7028071 * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() * - * @modules jdk.management * @run main GetProcessCpuLoad */
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4858522 * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuTime() * @author Steve Bohne - * @modules jdk.management */ /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 7028071 * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad() * - * @modules jdk.management * @run main GetSystemCpuLoad */
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4858522 * @summary Basic unit test of OperatingSystemMXBean.getTotalPhysicalMemorySize() * @author Steve Bohne - * @modules jdk.management */ /*
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/MemoryStatusOverflow.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * the GlobalMemoryStatus function can return incorrect information, * reporting a value of -1 to indicate an overflow. * - * @modules jdk.management * @run main MemoryStatusOverflow */
--- a/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Sat Mar 25 00:31:29 2017 +0100 @@ -25,14 +25,13 @@ * @test * @bug 4858522 * @summary Basic unit test of OperatingSystemMXBean.getTotalSwapSpaceSize() + * @author Steve Bohne + * @author Jaroslav Bachorik * * @library /lib/testlibrary - * @modules jdk.management + * * @build TestTotalSwap jdk.testlibrary.* * @run main TestTotalSwap - * - * @author Steve Bohne - * @author Jaroslav Bachorik */ /*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/com/sun/management/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.management +
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 6173675 * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes * @author Paul Hohensee - * @modules jdk.management */ import java.lang.management.*;
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 6173675 * @summary Basic test of ThreadMXBean.getThreadAllocatedBytes(long[]) * @author Paul Hohensee - * @modules jdk.management */ import java.lang.management.*;
--- a/jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java Sat Mar 25 00:31:29 2017 +0100 @@ -24,11 +24,10 @@ /* * @test * @bug 6173675 + * @key randomness * @summary Basic test of ThreadMXBean.getThreadCpuTime(long[]) and * getThreadUserTime(long[]). * @author Paul Hohensee - * @key randomness - * @modules jdk.management */ import java.lang.management.*;
--- a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh Sat Mar 25 00:31:29 2017 +0100 @@ -24,10 +24,9 @@ # # @test # @bug 4858522 -# @summary +# @summary # @author Steve Bohne # -# @modules jdk.management # @run shell GetMaxFileDescriptorCount.sh # @@ -40,7 +39,7 @@ fi runOne() -{ +{ echo "runOne $@" $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d $TESTCLASSES \ $TESTSRC/$@.java || exit 2
--- a/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh Sat Mar 25 00:31:29 2017 +0100 @@ -24,10 +24,9 @@ # # @test # @bug 4858522 -# @summary +# @summary # @author Steve Bohne # -# @modules jdk.management # @run shell GetOpenFileDescriptorCount.sh # @@ -39,7 +38,7 @@ COMPILEJAVA="${TESTJAVA}" fi runOne() -{ +{ echo "runOne $@" $COMPILEJAVA/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d $TESTCLASSES \ $TESTSRC/$@.java || exit 2
--- a/jdk/test/com/sun/management/VMOptionOpenDataTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/management/VMOptionOpenDataTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -38,7 +38,6 @@ * @test * @bug 8042901 * @summary Check that MappedMXBeanType.toOpenTypeData supports VMOption - * @modules jdk.management/com.sun.management * @author Shanliang Jiang */ public class VMOptionOpenDataTest {
--- a/jdk/test/com/sun/tools/attach/BasicTests.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/tools/attach/BasicTests.java Sat Mar 25 00:31:29 2017 +0100 @@ -40,16 +40,17 @@ /* * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 - * @summary Basic unit tests for the VM attach mechanism. * @key intermittent + * @summary Basic unit tests for the VM attach mechanism. This test will perform + * a number of basic attach tests. + * * @library /lib/testlibrary * @modules java.instrument - * java.management + * jdk.attach * jdk.jartool/sun.tools.jar + * * @run build jdk.testlibrary.* Agent BadAgent RedefineAgent Application RedefineDummy RunnerUtil * @run main BasicTests - * - * This test will perform a number of basic attach tests. */ public class BasicTests {
--- a/jdk/test/com/sun/tools/attach/PermissionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/tools/attach/PermissionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -31,17 +31,15 @@ /* * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 - * @summary Basic unit tests for the VM attach mechanism. - * @modules jdk.jartool/sun.tools.jar + * @summary Basic unit tests for the VM attach mechanism. Unit test for Attach + * API - this checks that a SecurityException is thrown as expected. + * * @library /lib/testlibrary - * @modules java.management - * jdk.attach + * @modules jdk.attach * jdk.jartool/sun.tools.jar + * * @run build jdk.testlibrary.* Application * @run main PermissionTest - * - * Unit test for Attach API - - * this checks that a SecurityException is thrown as expected. */ public class PermissionTest {
--- a/jdk/test/com/sun/tools/attach/ProviderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/tools/attach/ProviderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -31,16 +31,15 @@ /* * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 - * @summary Basic unit tests for the VM attach mechanism. - * @modules jdk.jartool/sun.tools.jar + * @summary Basic unit tests for the VM attach mechanism. The test will attach + * and detach to/from the running Application. + * * @library /lib/testlibrary - * @modules java.management - * jdk.attach + * @modules jdk.attach * jdk.jartool/sun.tools.jar + * * @run build jdk.testlibrary.* SimpleProvider * @run main ProviderTest - * - * The test will attach and detach to/from the running Application. */ public class ProviderTest {
--- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java Sat Mar 25 00:31:29 2017 +0100 @@ -39,11 +39,12 @@ /* * @test * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent - * @modules jdk.jartool/sun.tools.jar + * * @library /lib/testlibrary - * @modules jdk.management.agent + * @modules java.management * jdk.attach * jdk.jartool/sun.tools.jar + * * @run build Application SimpleProvider jdk.testlibrary.* * @run main/timeout=300 StartManagementAgent */
--- a/jdk/test/com/sun/tools/attach/TempDirTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/com/sun/tools/attach/TempDirTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -37,10 +37,11 @@ * @test * @bug 8033104 * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set - * @modules jdk.jartool/sun.tools.jar + * * @library /lib/testlibrary - * @modules java.management + * @modules jdk.attach * jdk.jartool/sun.tools.jar + * * @run build jdk.testlibrary.* Application RunnerUtil * @run main/timeout=200 TempDirTest */
--- a/jdk/test/java/lang/instrument/RedefineModuleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/instrument/RedefineModuleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/instrument/TestAgentWithLimitMods.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/instrument/TestAgentWithLimitMods.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 *
--- a/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,7 @@ * ClassLoadingMXBean.getTotalLoadedClassCount() * ClassLoadingMXBean.getUnloadedClassCount() * @author Alexei Guibadoulline - * @modules java.management + * * @run main/othervm LoadCounts */
--- a/jdk/test/java/lang/management/CompilationMXBean/Basic.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/CompilationMXBean/Basic.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/CompositeData/MemoryUsageCompositeData.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * or throw exception if the input CompositeData is invalid. * @author Mandy Chung * - * @modules java.management * @build MemoryUsageCompositeData * @run main MemoryUsageCompositeData */
--- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * the input CompositeData is invalid. * @author Mandy Chung * - * @modules java.management * @compile OpenTypeConverter.java * @build ThreadInfoCompositeData * @run main ThreadInfoCompositeData
--- a/jdk/test/java/lang/management/ManagementFactory/GetObjectName.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/GetObjectName.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * methods and PlatformManagedObject.getObjectName() * @author Mandy Chung * - * @modules jdk.management * @run main GetPlatformMXBeans */
--- a/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * ManagementFactory.getPlatformManagementInterfaces() method * @author Frederic Parain * - * @modules jdk.management * @run main GetPlatformManagementInterfaces */
--- a/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanException.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * * @author Mandy Chung * - * @modules jdk.management * @build MXBeanException * @run main MXBeanException */
--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,9 @@ * @bug 4947536 * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer() * @author Mandy Chung - * @modules jdk.management + * + * @modules java.logging + * jdk.management */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * returned from Management.newPlatformMXBeanProxy(). * @author Mandy Chung * - * @modules jdk.management * @compile ProxyTypeMapping.java * @run main/othervm -verbose:gc ProxyTypeMapping */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.management +
--- a/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * MBeanServer. * @author Mandy Chung * - * @modules jdk.management * @compile ValidateOpenTypes.java * @run main/othervm -verbose:gc ValidateOpenTypes */
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementConcMarkSweepGC.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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 }
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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 }
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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 }
--- a/jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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 }
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * MemoryPoolMXBean.isCollectionThresholdExceeded(). * @author Mandy Chung * - * @modules java.management * @run main/othervm ThresholdTest */
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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 #
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Test if proxy for PlatformLoggingMXBean is equivalent * to proxy for LoggingMXBean * - * @modules jdk.management * @build LoggingMXBeanTest * @run main LoggingMXBeanTest */
--- a/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -24,12 +24,10 @@ /* * @test * @bug 6876135 7024172 7067691 - * * @summary Test PlatformLoggingMXBean * This test performs similar testing as * java/util/logging/LoggingMXBeanTest. * - * @modules jdk.management * @build PlatformLoggingMXBeanTest * @run main PlatformLoggingMXBeanTest */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/management/PlatformLoggingMXBean/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = java.logging +
--- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4990512 * @summary Basic Test for RuntimeMXBean.getSystemProperties(). * @author Mandy Chung - * @modules java.management */ import java.lang.management.ManagementFactory;
--- a/jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/RuntimeMXBean/PropertiesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 4530538 * @summary Basic unit test of RuntimeMXBean.getUptime() * @author Alexei Guibadoulline - * @modules java.management */ import java.lang.management.*;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/lang/management/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = java.management +
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/DisableTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/EnableTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * and ThreadMXBean.setThreadCpuTimeEnabled(). * @author Mandy Chung * - * @modules java.management * @run main EnableTest */
--- a/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/FindDeadlocks.java Sat Mar 25 00:31:29 2017 +0100 @@ -31,7 +31,6 @@ * - ThreadMXBean.findMonitorDeadlockedThreads() * @author Mandy Chung * - * @modules java.management * @build MonitorDeadlock * @build SynchronizerDeadlock * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * - ThreadMXBean.findMonitorDeadlockedThreads() * @author Mandy Chung * - * @modules java.management * @build MonitorDeadlock * @build ThreadDump * @run main/othervm FindMonitorDeadlock
--- a/jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/InvalidThreadID.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/LockedMonitors.java Sat Mar 25 00:31:29 2017 +0100 @@ -34,7 +34,6 @@ * * @author Mandy Chung * - * @modules java.management * @build Barrier * @build LockingThread * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java Sat Mar 25 00:31:29 2017 +0100 @@ -30,7 +30,6 @@ * * @author Mandy Chung * - * @modules java.management * @build Barrier * @build SynchronizerLockingThread * @build ThreadDump
--- a/jdk/test/java/lang/management/ThreadMXBean/Locks.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/Locks.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,6 @@ * @author Mandy Chung * @author Jaroslav Bachorik * - * @modules java.management * @build ResetPeakThreadCount * @build ThreadDump * @run main/othervm ResetPeakThreadCount
--- a/jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java Sat Mar 25 00:31:29 2017 +0100 @@ -30,7 +30,6 @@ * mbean.getDaemonThreadCount() * @author Alexei Guibadoulline * - * @modules java.management * @run main ThreadCounts */
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic test of ThreadMXBean.getThreadCpuTime and * getCurrentThreadCpuTime. * @author Mandy Chung - * @modules java.management */ import java.lang.management.*;
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadDaemonTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -31,7 +31,6 @@ * @bug 6588467 * @summary Basic test of ThreadInfo.isDaemon * @author Jeremy Manson - * @modules java.management */ public class ThreadDaemonTest {
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadLists.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java Sat Mar 25 00:31:29 2017 +0100 @@ -28,7 +28,6 @@ * ThreadInfo.getThreadState() * @author Mandy Chung * - * @modules java.management * @run build Utils * @run main ThreadStackTrace */
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadUserTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,6 @@ * @summary Basic test of ThreadMXBean.getThreadUserTime and * getCurrentThreadUserTime. * @author Mandy Chung - * @modules java.management */ import java.lang.management.*;
--- a/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ImplementationVersion/ImplVersionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/AnnotationSecurityTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/AnnotationSecurityTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,10 @@ * @summary Test that having a security manager doesn't trigger a * NotCompliantMBeanException * @author Daniel Fuchs, Yves Joan - * @modules java.management + * + * @modules java.desktop + * java.management + * * @run clean AnnotationSecurityTest Described UnDescribed DescribedMBean * UnDescribedMBean SqeDescriptorKey DescribedMX DescribedMXBean * @run build AnnotationSecurityTest Described UnDescribed DescribedMBean
--- a/jdk/test/javax/management/Introspector/AnnotationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/AnnotationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/ChangingNotifsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/ChangingNotifsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/ClassLeakTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/ClassLeakTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/DuplicateGetterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/DuplicateGetterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/javax/management/Introspector/FeatureOrderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/FeatureOrderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/IdenticalMBeanInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/ImmutableNotificationInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/InvokeGettersTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/InvokeGettersTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/IsMethodTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/IsMethodTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/LegacyConstructorPropertiesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/Introspector/NotAnMBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/NotAnMBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/NotCompliantCauseTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/NotCompliantCauseTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 @@ -40,7 +40,6 @@ */ import java.util.Random; -import java.util.logging.Logger; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; @@ -55,12 +54,6 @@ public class NotCompliantCauseTest { /** - * A logger for this class. - **/ - private static final Logger LOG = - Logger.getLogger(NotCompliantCauseTest.class.getName()); - - /** * Creates a new instance of NotCompliantCauseTest */ public NotCompliantCauseTest() {
--- a/jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/SetWrongTypeAttributeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/EqualExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/NullInfoArraysTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/SerializationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/SerializationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/SerializationTest1.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/SerializationTest1.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanInfo/TooManyFooTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanInfo/TooManyFooTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 @@ -55,12 +55,6 @@ */ public class TooManyFooTest { - /** - * A logger for this class. - **/ - private static final Logger LOG = - Logger.getLogger(TooManyFooTest.class.getName()); - public static class NumberHolder { public Integer getNumber() { return 0;} public void setNumber(Integer n) {};
--- a/jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/MBeanExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/MBeanFallbackTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/MBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/MBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/NewMBeanListenerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/NotifDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/PostExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/PostExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServer/PreRegisterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServer/PreRegisterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MBeanServerFactory/ReleaseMBeanServerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectInstance/MBeanInfoFailTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectInstance/ToStringMethodTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/ApplyWildcardTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/ApplyWildcardTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/ComparatorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/ComparatorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/NullEmptyKeyValueTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/RepositoryWildcardTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/SerialCompatTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/SerialCompatTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/ObjectName/ValueWildcardTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/ObjectName/ValueWildcardTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/management/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = java.management +
--- a/jdk/test/javax/management/descriptor/DefaultDescriptorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/DefaultDescriptorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/DescriptorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/DescriptorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/EqualsHashCodeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/EqualsHashCodeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/ImmutableArrayFieldTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/MBeanInfoInteropTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/descriptor/UnionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/descriptor/UnionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/generified/GenericTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/generified/GenericTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/generified/ListTypeCheckTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/generified/ListTypeCheckTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/ArrayClassTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/ArrayClassTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/DocumentRootTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/DocumentRootTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/GetMBeansFromURLTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/GetMBeansFromURLTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/MLetCLR/MLetCommand.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/MLetContentTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/MLetContentTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/MletParserLocaleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/MletParserLocaleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/ParserInfiniteLoopTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/ParserInfiniteLoopTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/loading/SystemClassLoaderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/loading/SystemClassLoaderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/DescriptorSupportSerialTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/DescriptorSupportTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/DescriptorSupportXMLLocaleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/DescriptorSupportXMLTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/ExoticTargetTypeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/InfoSupportTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/InfoSupportTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/LoggingExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/LoggingExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -29,7 +29,9 @@ * when traces enabled and no attributes. * @author Luis-Miguel Alventosa * @author Paul Cheeseman - * @modules java.management + * + * @modules java.logging + * java.management */ import java.util.logging.ConsoleHandler;
--- a/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/OnUnregisterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/OnUnregisterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanMethodTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/CounterMonitorDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/CounterMonitorInitThresholdTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/CounterMonitorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/CounterMonitorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/DerivedGaugeMonitorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/GaugeMonitorDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/MultiMonitorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/MultiMonitorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/NonComparableAttributeValueTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/NullAttributeValueTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/NullAttributeValueTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/ReflectionExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/ReflectionExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/RuntimeExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/RuntimeExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/StartStopTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/StartStopTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/StringMonitorDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/ThreadPoolAccTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/ThreadPoolAccTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/monitor/ThreadPoolTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/monitor/ThreadPoolTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/AmbiguousConstructorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/ComparatorExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/ComparatorExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/ExceptionDiagnosisTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/mxbean/GenericTypeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/GenericTypeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/LeakTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/LeakTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MBeanOperationInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanAnnotationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MXBeanFallbackTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanFallbackTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MXBeanFlagTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanFlagTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MXBeanLoadingTest1.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanLoadingTest1.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanPreRegisterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MXBeanRefTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MXBeanRefTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/MiscTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/MiscTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/OperationImpactTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/OperationImpactTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/OverloadTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/OverloadTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/PreRegisterNameTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/PreRegisterNameTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/mxbean/PropertyNamesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/PropertyNamesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/SameObjectTwoNamesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/StandardMBeanOverrideTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/mxbean/ThreadMXBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/ThreadMXBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/javax/management/mxbean/TypeNameTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/mxbean/TypeNameTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/notification/BroadcasterSupportDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/notification/FilterExceptionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/notification/FilterExceptionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/notification/NotifExecutorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/notification/NotifExecutorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/notification/NotifInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/notification/NotifInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/ArrayTypeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/ArrayTypeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/BadConstraintTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/BadConstraintTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/CompositeDataStringTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/CompositeDataStringTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/openmbean/ConstraintTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/ConstraintTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/EqualsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/EqualsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/IsValueTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/IsValueTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 5072004 * @summary Test new rules for isValue * @author Eamonn McManus - * @modules java.management */ import javax.management.openmbean.*;
--- a/jdk/test/javax/management/openmbean/NullConstructorParamsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/NullConstructorParamsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/openmbean/OpenTypeDescriptorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/proxy/JMXProxyFallbackTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/proxy/JMXProxyFallbackTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/proxy/JMXProxyTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/proxy/JMXProxyTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/proxy/NotificationEmitterProxy.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/proxy/NotificationEmitterProxy.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/proxy/ProxyObjectMethodsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/query/CustomQueryTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/query/CustomQueryTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/query/InstanceOfExpTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/query/InstanceOfExpTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/query/QueryExpStringTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/query/QueryExpStringTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/query/QueryMatchTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/query/QueryMatchTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/query/QuerySubstringTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/query/QuerySubstringTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/relation/NonArrayListTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/relation/NonArrayListTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/relation/RelationNotificationSeqNoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,6 @@ * @bug 6701459 * @summary Test sequence numbers in RelationService notifications. * @author Eamonn McManus - * @modules java.management */ /*
--- a/jdk/test/javax/management/relation/RelationNotificationSourceTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/relation/RelationNotificationSourceTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/relation/RelationTypeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/relation/RelationTypeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/management/remote/mandatory/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = java.management.rmi +
--- a/jdk/test/javax/management/remote/mandatory/URLTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/URLTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/AddressableTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/CloseServerTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/CloseableTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/ConnectionListenerNullTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/ConnectionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/DeadLockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/GetConnectionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/IIOPURLTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/JMXServiceURLLocaleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/MultiOpenCloseTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/RMIConnectorLogAttributesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -55,6 +55,9 @@ * @bug 8147857 * @summary Tests whether RMIConnector logs attribute names correctly. * @author Severin Gehwolf + * + * @modules java.logging + * java.management.rmi */ public class RMIConnectorLogAttributesTest {
--- a/jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/RMIExitTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/RMISerializeTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connection/ReconnectTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connectorServer/JNDIFailureTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/MethodResultTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */ /*
--- a/jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/AddRemoveTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/ConcurrentModificationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -26,7 +26,7 @@ * @bug 7120365 * @summary test on Concurrent Modification * @author Shanliang JIANG - * @modules java.management.rmi + * * @run main ConcurrentModificationTest */
--- a/jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/DiffHBTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/RMINotifTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/ServerNotifs.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/provider/ProviderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/threads/ExecutorShutdownTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/threads/ExecutorTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/threads/NoServerTimeoutTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/remote/mandatory/version/ImplVersionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/security/MBeanPermissionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/security/MBeanPermissionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/javax/management/standardmbean/DeadlockTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/standardmbean/DeadlockTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/javax/management/timer/MissingNotificationTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/timer/MissingNotificationTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/javax/management/timer/StartTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/javax/management/timer/StartTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/jvmstat/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.internal.jvmstat/sun.jvmstat.monitor +
--- a/jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java Sat Mar 25 00:31:29 2017 +0100 @@ -24,8 +24,10 @@ /* * @test * @bug 4990825 - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor * @summary test that HostIdentifier objects get created as expected + * + * @modules java.xml + * jdk.internal.jvmstat/sun.jvmstat.monitor */ import java.io.*;
--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- a/jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java Sat Mar 25 00:31:29 2017 +0100 @@ -24,8 +24,10 @@ /* * @test * @bug 4990825 - * @modules jdk.internal.jvmstat/sun.jvmstat.monitor * @summary test that VmIdentifier objects get created as expected + * + * @modules java.xml + * jdk.internal.jvmstat/sun.jvmstat.monitor */ import java.io.*;
--- a/jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java Sat Mar 25 00:31:29 2017 +0100 @@ -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.*;
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetInitializedClassCount.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/LazyCompositeDataTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/LazyCompositeDataTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 +} +
--- a/jdk/test/sun/management/LoggingTest/LoggingWithJULTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/LoggingTest/LoggingWithJULTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 {
--- a/jdk/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/LoggingTest/LoggingWithLoggerFinderTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 {
--- a/jdk/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/StackTraceElementCompositeData/CompatibilityTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/management/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = java.management/sun.management +
--- a/jdk/test/sun/management/jdp/JdpDefaultsTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jdp/JdpDefaultsTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jdp/JdpJmxRemoteDynamicPortTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- a/jdk/test/sun/management/jdp/JdpOffTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jdp/JdpOffTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/jdp/JdpSpecificAddressTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jdp/JdpSpecificAddressTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/management/jdp/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,3 @@ +modules = jdk.management.agent/sun.management.jdp \ + java.logging +
--- a/jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/management/jmxremote/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,3 @@ +modules = jdk.management.agent/jdk.internal.agent \ + jdk.management.agent/sun.management.jmxremote +
--- a/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -40,12 +40,16 @@ /** * @test * @bug 6434402 8004926 + * @author Jaroslav Bachorik + * * @library /lib/testlibrary - * @modules jdk.management.agent/jdk.internal.agent + * @modules java.management + * jdk.attach + * 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");
--- a/jdk/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -48,9 +48,9 @@ * @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 + * @modules java.management.rmi + * * @build jdk.testlibrary.* JMXAgentInterfaceBinding * @run main/timeout=5 JMXInterfaceBindingTest */
--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -27,7 +27,11 @@ * @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 + * + * @modules java.management + * jdk.attach + * jdk.management.agent/jdk.internal.agent + * * @run clean JvmstatCountersTest * @run build JvmstatCountersTest * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1
--- a/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -32,13 +32,17 @@ /** * @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 + * @modules java.management + * jdk.attach + * jdk.management.agent/jdk.internal.agent + * * @build jdk.testlibrary.* TestManager TestApplication * @run main/othervm/timeout=300 LocalManagementTest */
--- a/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 {
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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`
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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");
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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=""
--- a/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh Sat Mar 25 00:31:29 2017 +0100 @@ -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=""
--- a/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 {
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -53,13 +53,17 @@ /** * @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 + * @modules java.management + * java.rmi + * 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";
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusPerfCountersTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jcmd/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jcmd +
--- a/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jcmd/TestJcmdDefaults.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jcmd/TestJcmdSanity.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jcmd/TestJcmdSanity.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jhsdb/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,3 @@ +modules = jdk.hotspot.agent \ + java.management +
--- a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -36,11 +36,12 @@ * @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 - * @build jdk.testlibrary.* - * @build jdk.test.lib.apps.* + * @modules java.management + * jdk.hotspot.agent/sun.jvm.hotspot + * * @build JMapHeapConfigTest TmtoolTestScenario * @run main JMapHeapConfigTest */
--- a/jdk/test/sun/tools/jinfo/JInfoTest.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jinfo/JInfoTest.java Sat Mar 25 00:31:29 2017 +0100 @@ -36,11 +36,12 @@ /* * @test * @summary Unit test for jinfo utility - * @modules java.base/jdk.internal.misc + * * @library /test/lib - * @build jdk.test.lib.* - * @build jdk.test.lib.apps.* - * @build jdk.test.lib.process.* + * @modules java.base/jdk.internal.misc + * java.management + * jdk.jcmd + * * @run main JInfoTest */ public class JInfoTest {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jinfo/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jcmd +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jmap/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jcmd +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstack/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jcmd +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstat/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,2 @@ +modules = jdk.jcmd +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/tools/jstatd/TEST.properties Sat Mar 25 00:31:29 2017 +0100 @@ -0,0 +1,5 @@ +modules = java.management \ + java.rmi + jdk.jcmd \ + jdk.jstatd +
--- a/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jstatd/TestJstatdDefaults.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jstatd/TestJstatdExternalRegistry.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jstatd/TestJstatdPort.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jstatd/TestJstatdPort.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jstatd/TestJstatdPortAndServer.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */
--- a/jdk/test/sun/tools/jstatd/TestJstatdServer.java Thu Mar 23 22:57:12 2017 +0000 +++ b/jdk/test/sun/tools/jstatd/TestJstatdServer.java Sat Mar 25 00:31:29 2017 +0100 @@ -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 */