[EagerAppCDS] fix testcases due to upstream updates

Summary: as title Testing: jdk/test/com/alibaba/{quickstart,cds} Reviewers: lingjun-cg, yulei Issue:
dragonwell-project · Jan 22, 2024 · ba5a932 · ba5a932
1 parent 4ca62b1
commit ba5a932
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 29 deletions.
diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadClass.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadClass.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test dumping with limited metaspace with loading of JVMCI related classes.
  *          VM should not crash but CDS dump will abort upon failure in allocating metaspace.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithException.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithException.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test load the class failed with EagerAppCDS flow
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @build Classes4CDS
  * @build trivial.TestSimple
  * @build TestSimpleWispUsage

diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithNullURL.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithNullURL.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test dumping with limited metaspace with loading of JVMCI related classes.
  *          VM should not crash but CDS dump will abort upon failure in allocating metaspace.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @build MyWebAppClassLoader
  * @build Classes4CDS
  * @build TestSimple

diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithWisp.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithWisp.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test EagerAppCDS Flow with wisp
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadNotFound.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadNotFound.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test dumping with not found class
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadVerficationFailure.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadVerficationFailure.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test dumping with verification failure
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestDumpListInParallel.java b/jdk/test/com/alibaba/cds/TestDumpListInParallel.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test dumping with limited metaspace with loading of JVMCI related classes.
  *          VM should not crash but CDS dump will abort upon failure in allocating metaspace.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestDumpUnsupportedCheck.java b/jdk/test/com/alibaba/cds/TestDumpUnsupportedCheck.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test dumping with limited metaspace with loading of JVMCI related classes.
  *          VM should not crash but CDS dump will abort upon failure in allocating metaspace.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestLoadClassFlow.java b/jdk/test/com/alibaba/cds/TestLoadClassFlow.java
@@ -2,7 +2,7 @@
  * @test
  * @summary Test dumping with limited metaspace with loading of JVMCI related classes.
  *          VM should not crash but CDS dump will abort upon failure in allocating metaspace.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestRegisterClassLoader.java b/jdk/test/com/alibaba/cds/TestRegisterClassLoader.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test class loader register in EagerCDS
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules jdk.compiler
  * @modules java.base/jdk.internal.misc
  * @modules java.base/com.alibaba.util:+open

diff --git a/jdk/test/com/alibaba/cds/TestSuppressingAppCDSErrors.java b/jdk/test/com/alibaba/cds/TestSuppressingAppCDSErrors.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test suppressing AppCDS startup failure.
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/TestWispWithAppCDS.java b/jdk/test/com/alibaba/cds/TestWispWithAppCDS.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test EagerAppCDS Flow with wisp
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/appcds/TestDumpAndLoadForAppCDS.java b/jdk/test/com/alibaba/cds/appcds/TestDumpAndLoadForAppCDS.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test dumping with not found class
- * @library /lib/testlibrary /lib
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  *          jdk.jartool/sun.tools.jar

diff --git a/jdk/test/com/alibaba/cds/testClassLoaderJVMTI.sh b/jdk/test/com/alibaba/cds/testClassLoaderJVMTI.sh
@@ -26,7 +26,7 @@
 #
 # @test
 # @summary test JVMTI API for preparation of class loader
-# @library /lib/testlibrary /lib
+# @library /test/lib
 # @modules jdk.compiler
 # @modules java.base/jdk.internal.misc
 # @requires os.arch=="amd64" | os.arch=="aarch64"

diff --git a/jdk/test/com/alibaba/cds/testDelegatingClassLoaderJVMTI.sh b/jdk/test/com/alibaba/cds/testDelegatingClassLoaderJVMTI.sh
@@ -25,7 +25,7 @@
 #
 # @test
 # @summary test JVMTI API for preparation of Delegating class loader
-# @library /lib/testlibrary /lib
+# @library /test/lib
 # @modules jdk.compiler
 # @modules java.base/jdk.internal.misc
 # @requires os.arch=="amd64" | os.arch=="aarch64"

diff --git a/jdk/test/com/alibaba/quickstart/TestAssemblyFiles.java b/jdk/test/com/alibaba/quickstart/TestAssemblyFiles.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test files assemblied into JDK
- * @library /lib
+ * @library /test/lib
  * @library /lib/testlibrary
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm TestAssemblyFiles

diff --git a/jdk/test/com/alibaba/quickstart/TestDeterminingTracerOrReplayer.java b/jdk/test/com/alibaba/quickstart/TestDeterminingTracerOrReplayer.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test the flow to determine tracer or replayer
- * @library /lib
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestDeterminingTracerOrReplayer
  */

diff --git a/jdk/test/com/alibaba/quickstart/TestDumpWithFixedJMXPort.java b/jdk/test/com/alibaba/quickstart/TestDumpWithFixedJMXPort.java
@@ -2,7 +2,7 @@
  * @test
  * @modules java.base/sun.security.action
  * @summary Test dumping using jcmd
- * @library /lib
+ * @library /test/lib
  * @build TestDump
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run driver ClassFileInstaller -jar test-notifyDumpByJcmd.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread

diff --git a/jdk/test/com/alibaba/quickstart/TestEnvVariableDump.java b/jdk/test/com/alibaba/quickstart/TestEnvVariableDump.java
@@ -1,15 +1,15 @@
 /*
  * @test
  * @summary Test Environment Variable Dump
- * @library /lib /lib/testlibrary
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestEnvVariableDump
  */
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import java.io.*;
 import java.util.Map;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 public class TestEnvVariableDump {
     private static String cachepath = System.getProperty("user.dir");

diff --git a/jdk/test/com/alibaba/quickstart/TestEnvVariableReplay.java b/jdk/test/com/alibaba/quickstart/TestEnvVariableReplay.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test Environment Variable Dump
- * @library /lib /lib/testlibrary
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @build TestEnvClass
  * @run driver ClassFileInstaller -jar test.jar TestEnvClass
@@ -11,7 +11,7 @@
 import jdk.test.lib.process.ProcessTools;
 import java.io.*;
 import java.util.Map;
-import static jdk.testlibrary.Asserts.*;
+import static jdk.test.lib.Asserts.*;
 
 public class TestEnvVariableReplay {
 

diff --git a/jdk/test/com/alibaba/quickstart/TestIntegrityCheck.java b/jdk/test/com/alibaba/quickstart/TestIntegrityCheck.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test Integrity Check
- * @library /lib
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestIntegrityCheck
  */

diff --git a/jdk/test/com/alibaba/quickstart/TestNotifyDump.java b/jdk/test/com/alibaba/quickstart/TestNotifyDump.java
@@ -2,7 +2,7 @@
  * @test
  * @modules java.base/sun.security.action
  * @summary Test dumping when process exits
- * @library /lib
+ * @library /test/lib
  * @build TestDump
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run driver ClassFileInstaller -jar test-notifyDump.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread

diff --git a/jdk/test/com/alibaba/quickstart/TestNotifyDumpByAPI.java b/jdk/test/com/alibaba/quickstart/TestNotifyDumpByAPI.java
@@ -2,7 +2,7 @@
  * @test
  * @modules java.base/sun.security.action
  * @summary Test dumping using java level API hooks
- * @library /lib
+ * @library /test/lib
  * @build TestDump
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run driver ClassFileInstaller -jar test-notifyDumpByAPI.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread

diff --git a/jdk/test/com/alibaba/quickstart/TestNotifyDumpByJcmd.java b/jdk/test/com/alibaba/quickstart/TestNotifyDumpByJcmd.java
@@ -2,7 +2,7 @@
  * @test
  * @modules java.base/sun.security.action
  * @summary Test dumping using jcmd
- * @library /lib
+ * @library /test/lib
  * @build TestDump
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run driver ClassFileInstaller -jar test-notifyDumpByJcmd.jar TestDump TestDump$Policy TestDump$ClassLoadingPolicy TestDump$WatcherThread

diff --git a/jdk/test/com/alibaba/quickstart/TestParallelProcessRun.java b/jdk/test/com/alibaba/quickstart/TestParallelProcessRun.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test the file lock to determine tracer or replayer
- * @library /lib
+ * @library /test/lib
  * @library /lib/testlibrary
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestParallelProcessRun

diff --git a/jdk/test/com/alibaba/quickstart/TestPrintStat.java b/jdk/test/com/alibaba/quickstart/TestPrintStat.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test -Xquickstart:printStat option
- * @library /lib
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestPrintStat
  */

diff --git a/jdk/test/com/alibaba/quickstart/TestQuickStartOptions.java b/jdk/test/com/alibaba/quickstart/TestQuickStartOptions.java
@@ -1,7 +1,7 @@
 /*
  * @test
  * @summary Test -Xquickstart options
- * @library /lib
+ * @library /test/lib
  * @requires os.arch=="amd64" | os.arch=="aarch64"
  * @run main/othervm/timeout=600 TestQuickStartOptions
  */