changeset 59595:a41d4b835eab nestmates

[nestmates] Fix @modules in new tests Contributed-by: amy.lu@oracle.com, mandy.chung@oracle.com, serguei.spitsyn@oracle.com
author mchung
date Mon, 30 Mar 2020 17:56:38 -0700
parents 912c4c0ca796
children c5a6786c46c0
files test/hotspot/jtreg/runtime/HiddenClasses/CastToParentTest.java test/hotspot/jtreg/runtime/HiddenClasses/GCHiddenClass.java test/hotspot/jtreg/runtime/HiddenClasses/HiddenClassStack.java test/hotspot/jtreg/runtime/HiddenClasses/HiddenGetModule.java test/hotspot/jtreg/runtime/HiddenClasses/InstantiateHiddenClass.java test/hotspot/jtreg/runtime/HiddenClasses/NestedHidden.java test/hotspot/jtreg/runtime/HiddenClasses/StressHiddenClasses.java test/hotspot/jtreg/runtime/HiddenClasses/TestHiddenClassUnloading.java test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java test/jdk/java/lang/instrument/HiddenClass/HiddenClassAgent.java test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java test/jdk/java/lang/invoke/defineHiddenClass/SelfReferenceDescriptor.java test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java
diffstat 15 files changed, 19 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/test/hotspot/jtreg/runtime/HiddenClasses/CastToParentTest.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/CastToParentTest.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @summary Test that a hidden class can be cast to its parent.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main CastToParentTest
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/GCHiddenClass.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/GCHiddenClass.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @summary Test that hidden classes get garbage collected.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main GCHiddenClass
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/HiddenClassStack.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/HiddenClassStack.java	Mon Mar 30 17:56:38 2020 -0700
@@ -26,8 +26,7 @@
  * @summary Test that stack tracing isn't broken if an exception is thrown
  *          in a hidden class.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main HiddenClassStack
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/HiddenGetModule.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/HiddenGetModule.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @summary Test that a hidden class has the same module as its lookup class.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @compile pkg/HasNamedModule.java
  * @run main/othervm HiddenGetModule
  */
--- a/test/hotspot/jtreg/runtime/HiddenClasses/InstantiateHiddenClass.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/InstantiateHiddenClass.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @summary Test issues with instantiating hidden classes.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main InstantiateHiddenClass
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/NestedHidden.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/NestedHidden.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @summary Creates a hidden class inside of a hidden class.
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main p.NestedHidden
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/StressHiddenClasses.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/StressHiddenClasses.java	Mon Mar 30 17:56:38 2020 -0700
@@ -26,8 +26,7 @@
  * @summary Stress defining hidden classes.
  * @requires !vm.graal.enabled
  * @library /test/lib
- * @modules java.compiler
- *          java.management
+ * @modules jdk.compiler
  * @run main/othervm StressHiddenClasses
  */
 
--- a/test/hotspot/jtreg/runtime/HiddenClasses/TestHiddenClassUnloading.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/runtime/HiddenClasses/TestHiddenClassUnloading.java	Mon Mar 30 17:56:38 2020 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary Test unloading of hidden classes.
+ * @modules java.management
  * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	Mon Mar 30 17:56:38 2020 -0700
@@ -27,8 +27,7 @@
  * @summary Test of diagnostic command VM.classloaders
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.compiler
- *          java.management
+ *          jdk.compiler
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @run testng ClassLoaderHierarchyTest
  */
--- a/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java	Mon Mar 30 17:56:38 2020 -0700
@@ -25,8 +25,7 @@
  * @test
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
- *          java.compiler
- *          java.management
+ *          jdk.compiler
  * @compile HiddenClassSigTest.java
  * @run main/othervm/native -agentlib:HiddenClassSigTest P.Q.HiddenClassSigTest
  */
--- a/test/jdk/java/lang/instrument/HiddenClass/HiddenClassAgent.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/jdk/java/lang/instrument/HiddenClass/HiddenClassAgent.java	Mon Mar 30 17:56:38 2020 -0700
@@ -24,7 +24,8 @@
 /**
  * @test
  * @library /test/lib
- * @modules java.compiler
+ * @modules java.instrument
+ *          jdk.compiler
  * @build jdk.test.lib.compiler.CompilerUtils
  *        jdk.test.lib.Utils *
  * @run shell ../MakeJAR3.sh HiddenClassAgent 'Can-Retransform-Classes: true'
--- a/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java	Mon Mar 30 17:56:38 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,9 @@
 
 /*
  * @test
- * @build  LambdaNestedInnerTest
- * @run testng/othervm p.LambdaNestedInnerTest
  * @summary define a lambda proxy class whose target class has an invalid
  *          nest membership
+ * @run testng/othervm p.LambdaNestedInnerTest
  */
 
 package p;
--- a/test/jdk/java/lang/invoke/defineHiddenClass/SelfReferenceDescriptor.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/SelfReferenceDescriptor.java	Mon Mar 30 17:56:38 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @modules jdk.compiler
  * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
--- a/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/jdk/java/lang/invoke/lambda/superProtectedMethod/InheritedProtectedMethod.java	Mon Mar 30 17:56:38 2020 -0700
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8239384
+ * @modules jdk.compiler
  * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
--- a/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	Mon Mar 30 17:40:53 2020 -0700
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	Mon Mar 30 17:56:38 2020 -0700
@@ -48,7 +48,8 @@
  * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules java.base/jdk.internal.misc
- *          java.compiler
+ *          jdk.compiler
+ *          jdk.jfr
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoaderStatsEvent
  */