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

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

Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -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
*/

@@ -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");
}
@@ -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",