Skip to content

8261830: [lworld] [test] ArchiveRelocationTest compilation failure #338

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.

Sign up for GitHub

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

Closed
wants to merge 2 commits into from
Closed

8261830: [lworld] [test] ArchiveRelocationTest compilation failure #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582e4e2
8261830: [lworld] [test] ArchiveRelocationTest compilation failure
RogerRiggs Feb 16, 2021
47a28c7
Removed unnecessary check in HelloDyanmicInlineClass
RogerRiggs Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* @comment JDK-8231610 Relocate the CDS archive if it cannot be mapped to the requested address
* @bug 8231610
* @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds/test-classes
* @build HelloRelocation
* @run driver ClassFileInstaller -jar hello.jar HelloRelocation HelloInlineClassApp HelloInlineClassApp$Point HelloInlineClassApp$Point$ref HelloInlineClassApp$Rectangle HelloInlineClassApp$Rectangle$ref
* @build Hello
* @run driver ClassFileInstaller -jar hello.jar Hello
* @run driver ArchiveRelocationTest
*/

Expand Down Expand Up @@ -59,22 +59,20 @@ static void test(boolean run_reloc) throws Exception {
System.out.println("============================================================");

String appJar = ClassFileInstaller.getJarPath("hello.jar");
String mainClass = "HelloRelocation";
String mainClass = "Hello";
String forceRelocation = "-XX:ArchiveRelocationMode=1";
String runRelocArg = run_reloc ? forceRelocation : "-showversion";
String logArg = "-Xlog:cds=debug,cds+reloc=debug";
String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
String nmtArg = "-XX:NativeMemoryTracking=detail";

OutputAnalyzer out = TestCommon.dump(appJar,
TestCommon.list(mainClass,
"HelloInlineClassApp",
"HelloInlineClassApp$Point"),
unlockArg, dumpRelocArg, logArg, nmtArg);
TestCommon.list(mainClass),
unlockArg, logArg, nmtArg);
out.shouldContain("Relocating archive from");

TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg, mainClass)
.assertNormalExit(output -> {
.assertNormalExit(output -> {
if (run_reloc) {
output.shouldContain("Try to map archive(s) at an alternative address");
}
Expand Down
3 changes: 1 addition & 2 deletions test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/HelloDynamicInlineClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ private static void doTest(String baseArchiveName, String topArchiveName) throws
"-Xlog:cds+dynamic=debug",
"-cp", appJar, mainClass)
.assertNormalExit(output -> {
output.shouldContain("Buffer-space to target-space delta")
.shouldContain("Written dynamic archive 0x");
output.shouldContain("Written dynamic archive 0x");
});
run2(baseArchiveName, topArchiveName,
"-Xlog:class+load",
Expand Down