From 403c658ee083c40d45608c0d132c6615040576f4 Mon Sep 17 00:00:00 2001 From: Jiawei_Tang Date: Mon, 22 Jan 2024 18:59:52 +0800 Subject: [PATCH] [EagerAppCDS] fix testcases due to upstream updates Summary: as title Testing: jdk/test/com/alibaba/{quickstart,cds} Reviewers: lingjun-cg, yulei Issue: --- jdk/test/com/alibaba/cds/TestDumpAndLoadClass.java | 2 +- .../com/alibaba/cds/TestDumpAndLoadClassWithException.java | 2 +- jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithNullURL.java | 2 +- jdk/test/com/alibaba/cds/TestDumpAndLoadClassWithWisp.java | 2 +- jdk/test/com/alibaba/cds/TestDumpAndLoadNotFound.java | 2 +- .../com/alibaba/cds/TestDumpAndLoadVerficationFailure.java | 2 +- jdk/test/com/alibaba/cds/TestDumpListInParallel.java | 2 +- jdk/test/com/alibaba/cds/TestDumpUnsupportedCheck.java | 2 +- jdk/test/com/alibaba/cds/TestLoadClassFlow.java | 2 +- jdk/test/com/alibaba/cds/TestRegisterClassLoader.java | 2 +- jdk/test/com/alibaba/cds/TestSuppressingAppCDSErrors.java | 2 +- jdk/test/com/alibaba/cds/TestWispWithAppCDS.java | 2 +- jdk/test/com/alibaba/cds/appcds/TestDumpAndLoadForAppCDS.java | 2 +- jdk/test/com/alibaba/cds/testClassLoaderJVMTI.sh | 2 +- jdk/test/com/alibaba/cds/testDelegatingClassLoaderJVMTI.sh | 2 +- jdk/test/com/alibaba/quickstart/TestAssemblyFiles.java | 2 +- .../alibaba/quickstart/TestDeterminingTracerOrReplayer.java | 2 +- jdk/test/com/alibaba/quickstart/TestDumpWithFixedJMXPort.java | 2 +- jdk/test/com/alibaba/quickstart/TestEnvVariableDump.java | 4 ++-- jdk/test/com/alibaba/quickstart/TestEnvVariableReplay.java | 4 ++-- jdk/test/com/alibaba/quickstart/TestIntegrityCheck.java | 2 +- jdk/test/com/alibaba/quickstart/TestNotifyDump.java | 2 +- jdk/test/com/alibaba/quickstart/TestNotifyDumpByAPI.java | 2 +- jdk/test/com/alibaba/quickstart/TestNotifyDumpByJcmd.java | 2 +- jdk/test/com/alibaba/quickstart/TestParallelProcessRun.java | 2 +- jdk/test/com/alibaba/quickstart/TestPrintStat.java | 2 +- jdk/test/com/alibaba/quickstart/TestQuickStartOptions.java | 2 +- 27 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jdk/test/com/alibaba/cds/TestDumpAndLoadClass.java b/jdk/test/com/alibaba/cds/TestDumpAndLoadClass.java index 43aa9f041db..5e2f49763ab 100644 --- 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 index f2c623b299c..c28c762444c 100644 --- 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 index 81cb27c6614..5184ba8d3d8 100644 --- 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 index dd52feb1fb4..8557d4780ea 100644 --- 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 index 7cfc520124d..6131522ad16 100644 --- 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 index c61db637ac4..cb4e5c7517a 100644 --- 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 index ac400cb1373..c8090532043 100644 --- 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 index 32a11056d08..7f06ccf05d4 100644 --- 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 index 9c09e21a5f0..8b3e8e18668 100644 --- 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 index f4a8d119484..6c9312474c2 100644 --- 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 index afb78a797b1..1a1e3da2023 100644 --- 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 index 9fbdde800c9..001fbf5f3d9 100644 --- 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 index f4142d7a284..b1206fe57fc 100644 --- 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 index f2e9292d999..6b320fe7d9d 100644 --- 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 index 518912cad39..963125fa07c 100644 --- 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 index dc41b63c15f..3adfa150f5a 100644 --- 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 index b85a41bfe3f..3009f58a5c8 100644 --- 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 index f6732ef48d7..48f6ec7f62f 100644 --- 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 index 7c1852d92ac..03e6f7cade0 100644 --- a/jdk/test/com/alibaba/quickstart/TestEnvVariableDump.java +++ b/jdk/test/com/alibaba/quickstart/TestEnvVariableDump.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" * @run main/othervm/timeout=600 TestEnvVariableDump */ @@ -9,7 +9,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 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 index fc80b092f75..9fe96d87e70 100644 --- 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 index 543782bb47a..137aff935a1 100644 --- 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 index d33a5c2e6f3..2abfd1d5bc1 100644 --- 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 index d2852037847..097f744af78 100644 --- 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 index 280c899e157..f1848b59fae 100644 --- 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 index 1a00d7b09b3..9e9c0a8b24d 100644 --- 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 index 42f712b0bc6..3b912d3029a 100644 --- 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 index b782fd9d72a..b6fdb0c1df1 100644 --- 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 */