Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8265719: [lworld] CDS tests fail after the merge with master #401

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -160,44 +160,6 @@ runtime/cds/DeterministicDump.java 8253495 generic-all
runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all

# Valhalla TODO:
runtime/CompressedOops/CompressedClassPointers.java 8210258 generic-all
runtime/SharedArchiveFile/BootAppendTests.java 8210258 generic-all
runtime/SharedArchiveFile/CdsDifferentCompactStrings.java 8210258 generic-all
runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java 8210258 generic-all
runtime/SharedArchiveFile/NonBootLoaderClasses.java 8210258 generic-all
runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java 8210258 generic-all
runtime/SharedArchiveFile/SharedArchiveFile.java 8210258 generic-all
runtime/SharedArchiveFile/SharedStringsDedup.java 8210258 generic-all
runtime/SharedArchiveFile/SharedStringsRunAuto.java 8210258 generic-all
runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java 8210258 generic-all
runtime/SharedArchiveFile/SpaceUtilizationCheck.java 8210258 generic-all
runtime/SharedArchiveFile/TestInterpreterMethodEntries.java 8210258 generic-all
runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformInterfaceAndImplementor.java 8210258 generic-all
runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperAndSubClasses.java 8210258 generic-all
runtime/SharedArchiveFile/serviceability/transformRelatedClasses/TransformSuperSubTwoPckgs.java 8210258 generic-all
runtime/appcds/ClassLoaderTest.java 8210258 generic-all
runtime/appcds/HelloTest.java 8210258 generic-all
runtime/appcds/sharedStrings/SharedStringsBasic.java 8210258 generic-all

runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java 8265719 generic-all
runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java 8265719 generic-all
runtime/cds/appcds/customLoader/ClassListFormatA.java 8265719 generic-all
runtime/cds/appcds/customLoader/ClassListFormatD.java 8265719 generic-all
runtime/cds/appcds/customLoader/ClassListFormatE.java 8265719 generic-all
runtime/cds/appcds/customLoader/HelloCustom.java 8265719 generic-all
runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8265719 generic-all
runtime/cds/appcds/customLoader/LoaderSegregationTest.java 8265719 generic-all
runtime/cds/appcds/customLoader/ParallelTestMultiFP.java 8265719 generic-all
runtime/cds/appcds/customLoader/ParallelTestSingleFP.java 8265719 generic-all
runtime/cds/appcds/customLoader/PrintSharedArchiveAndExit.java 8265719 generic-all
runtime/cds/appcds/customLoader/ProtectionDomain.java 8265719 generic-all
runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java 8265719 generic-all
runtime/cds/appcds/customLoader/UnintendedLoadersTest.java 8265719 generic-all
runtime/cds/appcds/customLoader/UnloadUnregisteredLoaderTest.java 8265719 generic-all
runtime/cds/appcds/jvmti/transformRelatedClasses/TransformInterfaceImplementorAppCDS.java 8265719 generic-all
runtime/cds/appcds/jvmti/transformRelatedClasses/TransformSuperSubAppCDS.java 8265719 generic-all

#############################################################################

# :hotspot_serviceability
@@ -51,7 +51,8 @@ public static void main(String[] args) throws Exception {
String classlist[] = new String[] {
"CheckCachedMirrorApp", // built-in app loader
"java/lang/Object id: 1", // boot loader
"Hello id: 2 super: 1 source: " + helloJarPath // custom loader
"java/lang/IdentityObject id: 2", // boot loader
"Hello id: 3 super: 1 interfaces: 2 source: " + helloJarPath // custom loader
};

TestCommon.testDump(appJar, classlist, use_whitebox_jar);
@@ -51,7 +51,8 @@ public static void main(String[] args) throws Exception {
String classlist[] = new String[] {
"CheckCachedResolvedReferencesApp", // built-in app loader
"java/lang/Object id: 1", // boot loader
"Hello id: 2 super: 1 source: " + helloJarPath // custom loader
"java/lang/IdentityObject id: 2", // boot loader
"Hello id: 3 super: 1 interfaces: 2 source: " + helloJarPath // custom loader
};

TestCommon.testDump(appJar, classlist, use_whitebox_jar);
@@ -98,10 +98,11 @@ appJar, classlist(
appJar, classlist(
"Hello ", // trailing spaces
"java/lang/Object\tid:\t1", // \t instead of ' '
"CustomLoadee id: 2 super: 1 source: " + customJarPath,
"CustomInterface2_ia id: 3 super: 1 source: " + customJarPath + " ",
"CustomInterface2_ib id: 4 super: 1 source: " + customJarPath + "\t\t\r" ,
"CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath // preceding spaces
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath,
"CustomInterface2_ia id: 4 super: 1 source: " + customJarPath + " ",
"CustomInterface2_ib id: 5 super: 1 source: " + customJarPath + "\t\t\r" ,
"CustomLoadee2 id: 6 super: 1 interfaces: 2 4 5 source: " + customJarPath // preceding spaces
));

int _max_allowed_line = 4096; // Must match ClassListParser::_max_allowed_line in C code.
@@ -54,7 +54,8 @@ public static void main(String[] args) throws Throwable {
appJar, classlist(
"Hello",
"java/lang/Object id: 1",
"CustomLoadee id: 1 super: 1 source: " + customJarPath
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 1 super: 1 interfaces: 2 source: " + customJarPath
),
"Duplicated ID 1 for class CustomLoadee");

@@ -95,11 +95,12 @@ appJar, classlist(
appJar, classlist(
"Hello",
"java/lang/Object id: 1",
"CustomInterface2_ia id: 2 super: 1 source: " + customJarPath,
"CustomInterface2_ib id: 3 super: 1 source: " + customJarPath,
"CustomLoadee id: 4 super: 1 source: " + customJarPath,
"CustomLoadee2 id: 5 super: 4 interfaces: 2 3 source: " + customJarPath
"java/lang/IdentityObject id: 2",
"CustomInterface2_ia id: 3 super: 1 source: " + customJarPath,
"CustomInterface2_ib id: 4 super: 1 source: " + customJarPath,
"CustomLoadee id: 5 super: 1 interfaces: 2 source: " + customJarPath,
"CustomLoadee2 id: 6 super: 5 interfaces: 2 3 4 source: " + customJarPath
),
"The specified super class CustomLoadee (id 4) does not match actual super class java.lang.Object");
"The specified super class CustomLoadee (id 5) does not match actual super class java.lang.Object");
}
}
@@ -58,7 +58,8 @@ public static void run(String... extra_runtime_args) throws Exception {
String classlist[] = new String[] {
"HelloUnload",
"java/lang/Object id: 1",
"CustomLoadee id: 2 super: 1 source: " + customJarPath
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath
};

OutputAnalyzer output;
@@ -77,17 +77,18 @@ public static void main(String[] args) throws Exception {
String classlist[] = new String[] {
"LoaderSegregation",
"java/lang/Object id: 1",
"java/lang/IdentityObject id: 2",

// These are the UNREGISTERED classes: they have "source:"
// but they don't have "loader:".
"CustomLoadee id: 2 super: 1 source: " + customJarPath,
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath,

"CustomInterface2_ia id: 3 super: 1 source: " + customJarPath,
"CustomInterface2_ib id: 4 super: 1 source: " + customJarPath,
"CustomLoadee2 id: 5 super: 1 interfaces: 3 4 source: " + customJarPath,
"CustomInterface2_ia id: 4 super: 1 source: " + customJarPath,
"CustomInterface2_ib id: 5 super: 1 source: " + customJarPath,
"CustomLoadee2 id: 6 super: 1 interfaces: 2 4 5 source: " + customJarPath,

"CustomLoadee3 id: 6 super: 1 source: " + customJarPath,
"CustomLoadee3Child id: 7 super: 6 source: " + customJarPath,
"CustomLoadee3 id: 7 super: 1 interfaces: 2 source: " + customJarPath,
"CustomLoadee3Child id: 8 super: 7 source: " + customJarPath,

// At dump time, the following BUILTIN classes are loaded after the UNREGISTERED
// classes from above. However, at dump time, they cannot use the UNREGISTERED classes are their
@@ -99,7 +100,7 @@ public static void main(String[] args) throws Exception {
// Check that BUILTIN and UNREGISTERED classes can be loaded only by their
// corresponding type of loaders.
"OnlyBuiltin",
"OnlyUnregistered id: 9 super: 1 source: " + customJarPath,
"OnlyUnregistered id: 10 super: 1 interfaces: 2 source: " + customJarPath,
};

OutputAnalyzer output;
@@ -55,10 +55,11 @@ public static void run(String[] args, int loaderType, int mode) throws Exception

for (int i = 0, n=0; i<MAX_CLASSES; i++) {
int super_id = 1;
int identity_object_interf_id = 2;
if (mode == FINGERPRINT_MODE) {
// fingerprint mode -- no need to use the "loader:" option.
int id = i + 2;
cust_list[i] = cust_classes[i] + " id: " + id + " super: " + super_id + " source: " + customJarPath;
int id = i + 3;
cust_list[i] = cust_classes[i] + " id: " + id + " super: " + super_id + " interfaces: " + identity_object_interf_id + " source: " + customJarPath;
} else {
throw new RuntimeException("Only FINGERPRINT_MODE is supported");
}
@@ -75,6 +76,7 @@ public static void run(String[] args, int loaderType, int mode) throws Exception
"ParallelLoadWatchdog");
app_list = new String[] {
"java/lang/Object id: 1",
"java/lang/IdentityObject id: 2",
"ParallelLoad",
"ParallelLoadThread",
"ParallelLoadWatchdog"
@@ -59,7 +59,8 @@ public static void run(String... extra_runtime_args) throws Exception {
String classlist[] = new String[] {
"HelloUnload",
"java/lang/Object id: 1",
"CustomLoadee id: 2 super: 1 source: " + customJarPath
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath
};

OutputAnalyzer output;
@@ -42,8 +42,9 @@ public static void main(String[] args) throws Exception {
"ProtDomainClassForArchive", "ProtDomainNotForArchive");
String[] classlist = new String[] {
"java/lang/Object id: 1",
"ProtDomain id: 2 super: 1 source: " + appJar,
"ProtDomainClassForArchive id: 3 super: 1 source: " + customJar
"java/lang/IdentityObject id: 2",
"ProtDomain id: 3 super: 1 interfaces: 2 source: " + appJar,
"ProtDomainClassForArchive id: 4 super: 1 interfaces: 2 source: " + customJar
};

TestCommon.testDump(appJar, classlist);
@@ -83,7 +83,8 @@ private static String[] getClassList_FP() {
return new String[] {
"SameNameUnrelatedLoaders",
"java/lang/Object id: 1",
"CustomLoadee id: 10 super: 1 source: " + customJar,
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 10 super: 1 interfaces: 2 source: " + customJar,
};
}
}
@@ -49,9 +49,10 @@ public static void main(String[] args) throws Exception {
String classlist[] = new String[] {
"UnintendedLoadersTest",
"java/lang/Object id: 1",
"java/lang/IdentityObject id: 2",

// Without "loader:" keyword.
"CustomLoadee id: 2 super: 1 source: " + customJarPath,
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath,
};

OutputAnalyzer output;
@@ -60,7 +60,8 @@ public static void main(String[] args) throws Exception {
"jdk/test/lib/classloader/ClassUnloadCommon$1",
"jdk/test/lib/classloader/ClassUnloadCommon$TestFailure",
"java/lang/Object id: 1",
"CustomLoadee id: 2 super: 1 source: " + customJarPath,
"java/lang/IdentityObject id: 2",
"CustomLoadee id: 3 super: 1 interfaces: 2 source: " + customJarPath,
};

OutputAnalyzer output;
@@ -130,16 +130,18 @@ private String[] getCustomClassList(String loaderType, String customJar) {
return new String[] {
"CustomLoaderApp",
"java/lang/Object id: 0",
parent + " id: 1 super: 0 source: " + customJar,
child + " id: 2 super: 1 source: " + customJar,
"java/lang/IdentityObject id: 1",
parent + " id: 2 super: 0 interfaces: 1 source: " + customJar,
child + " id: 3 super: 2 source: " + customJar,
};

case "Implementor-unregistered":
return new String[] {
"CustomLoaderApp",
"java/lang/Object id: 0",
parent + " id: 1 super: 0 source: " + customJar,
child + " id: 2 super: 0 interfaces: 1 source: " + customJar,
"java/lang/IdentityObject id: 1",
parent + " id: 2 super: 0 source: " + customJar,
child + " id: 3 super: 0 interfaces: 1 2 source: " + customJar,
};

default: