diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt index 5f5e23fb5c4..7b2da7969b4 100644 --- a/test/hotspot/jtreg/ProblemList.txt +++ b/test/hotspot/jtreg/ProblemList.txt @@ -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 diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java index 36f9d70bdaa..d69aa06b086 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedMirrorTest.java @@ -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); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java index 8fb40a9043f..233c3c1cc9b 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/cacheObject/CheckCachedResolvedReferences.java @@ -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); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java index 1275f752c05..d8b9f779a87 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatA.java @@ -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. diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java index 192714680c2..546364a9e05 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatD.java @@ -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"); diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java index 9f86f41f5d3..991b1665fa8 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ClassListFormatE.java @@ -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"); } } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java index 419164fbd1c..d5673040d1f 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/HelloCustom.java @@ -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; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java index 4a4c66ae4bb..2cc6b77a8e6 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/LoaderSegregationTest.java @@ -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; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java index 04ad39c8c99..03418b484b3 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/ParallelTestBase.java @@ -55,10 +55,11 @@ public static void run(String[] args, int loaderType, int mode) throws Exception for (int i = 0, n=0; i