stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8267958: [TESTBUG] cds DynamicLoaderConstraintsTest.java timed out

Browse Source 
Reviewed-by: ccheung, jiefu
This commit is contained in:
Ioi Lam 2021-06-02 19:05:42 +00:00
parent 1ae934e09d
commit ecf6112a21
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
View File

@ -22,10 +22,9 @@
*/
/**
* @test
* @test id=default-cl
* @requires vm.cds
* @summary Test class loader constraint checks for archived classes (dynamic archive)
* @bug 8267347
* @library /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds
* /test/hotspot/jtreg/runtime/cds/appcds/test-classes
@ -37,6 +36,22 @@
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. DynamicLoaderConstraintsTest
*/
/**
* @test id=custom-cl
* @requires vm.cds.custom.loaders
* @summary Test class loader constraint checks for archived classes (dynamic archive) with custom class loader
* @bug 8267347
* @library /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds
* /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* /test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive
* @modules java.base/jdk.internal.misc
* jdk.httpserver
* @build sun.hotspot.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. DynamicLoaderConstraintsTest custom
*/
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import jdk.test.lib.Asserts;
@ -63,21 +78,24 @@ public class DynamicLoaderConstraintsTest extends DynamicArchiveTestBase {
loaderMainClass
};
/*
* useCustomLoader: if true, load the LoaderConstraintsApp in a custom loader before executing it.
* if false, LoaderConstraintsApp will be loaded by the built-in AppClassLoader.
*/
static boolean useCustomLoader;
public static void main(String[] args) throws Exception {
useCustomLoader = (args.length != 0);
runTest(DynamicLoaderConstraintsTest::doTest);
}
static void doTest() throws Exception {
appJar = ClassFileInstaller.writeJar("loader_constraints.jar", appClasses);
doTest(false, false);
doTest(true, false);
if (!Platform.isWindows()) {
// custom loaders are not supported on Windows yet.
if (useCustomLoader) {
loaderJar = ClassFileInstaller.writeJar("custom_app_loader.jar", loaderClasses);
doTest(false, true);
doTest(true, true);
}
doTest(false);
doTest(true);
}
/*
@ -89,11 +107,8 @@ public class DynamicLoaderConstraintsTest extends DynamicArchiveTestBase {
* causing LinkageError. This ensures the test classes will be
* archived so we can test CDS's handling of loader constraints during
* run time.
*
* useCustomLoader: if true, load the LoaderConstraintsApp in a custom loader before executing it.
* if false, LoaderConstraintsApp will be loaded by the built-in AppClassLoader.
*/
static void doTest(boolean errorInDump, boolean useCustomLoader) throws Exception {
static void doTest(boolean errorInDump) throws Exception {
for (int i = 1; i <= 3; i++) {
System.out.println("========================================");
System.out.println("errorInDump: " + errorInDump + ", useCustomLoader: " + useCustomLoader + ", case: " + i);

22
test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/LoaderConstraintsTest.java
View File

@ -22,10 +22,9 @@
*/
/**
* @test
* @test id=default-cl
* @requires vm.cds
* @summary Test class loader constraint checks for archived classes
* @bug 8267347 8267754
* @library /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds
* /test/hotspot/jtreg/runtime/cds/appcds/test-classes
@ -34,6 +33,20 @@
* @run driver LoaderConstraintsTest
*/
/**
* @test id=custom-cl
* @requires vm.cds.custom.loaders
* @summary Test class loader constraint checks for archived classes with custom class loader
* @bug 8267347
* @library /test/lib
* /test/hotspot/jtreg/runtime/cds/appcds
* /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @modules java.base/jdk.internal.misc
* jdk.httpserver
* @run driver LoaderConstraintsTest custom
*/
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import jdk.test.lib.Asserts;
@ -109,8 +122,9 @@ public class LoaderConstraintsTest {
public static void main(String... args) throws Exception {
appJar = ClassFileInstaller.writeJar("loader_constraints.jar", appClasses);
doTest();
if (Platform.areCustomLoadersSupportedForCDS()) {
if (args.length == 0) {
doTest();
} else {
loaderJar = ClassFileInstaller.writeJar("custom_app_loader.jar", loaderClasses);
doTestCustomLoader();
}