Skip to content
Permalink
Browse files
8273774: CDSPluginTest should only expect classes_nocoops.jsa exists …
…on supported 64-bit platforms

Reviewed-by: ccheung, mchung
  • Loading branch information
1996scarlet authored and calvinccheung committed Sep 17, 2021
1 parent 2f8c221 commit 83020617e70d40a42029720534af561f8af8bce2
Showing 1 changed file with 13 additions and 2 deletions.
@@ -29,6 +29,8 @@

import tests.Helper;

import jtreg.SkippedException;

/* @test
* @bug 8264322
* @summary Test the --generate-cds-archive plugin
@@ -49,6 +51,9 @@ public class CDSPluginTest {

public static void main(String[] args) throws Throwable {

if (!Platform.isDefaultCDSArchiveSupported())
throw new SkippedException("not a supported platform");

Helper helper = Helper.newHelper();
if (helper == null) {
System.err.println("Test not run");
@@ -69,8 +74,14 @@ public static void main(String[] args) throws Throwable {
subDir = "lib" + sep;
}
subDir += "server" + sep;
helper.checkImage(image, module, null, null,
new String[] { subDir + "classes.jsa", subDir + "classes_nocoops.jsa" });

if (Platform.isAArch64() || Platform.isX64()) {
helper.checkImage(image, module, null, null,
new String[] { subDir + "classes.jsa", subDir + "classes_nocoops.jsa" });
} else {
helper.checkImage(image, module, null, null,
new String[] { subDir + "classes.jsa" });
}

// Simulate different platforms between current runtime and target image.
if (Platform.isLinux()) {

1 comment on commit 8302061

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 8302061 Sep 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.