Skip to content

Commit

Permalink
8273774: CDSPluginTest should only expect classes_nocoops.jsa exists …
Browse files Browse the repository at this point in the history 
…on supported 64-bit platforms

Reviewed-by: ccheung, mchung
  • Loading branch information
@1996scarlet @calvinccheung
1996scarlet authored and calvinccheung committed Sep 17, 2021
1 parent 2f8c221 commit 8302061
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions test/jdk/tools/jlink/plugins/CDSPluginTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

import tests.Helper;

import jtreg.SkippedException;

/* @test
* @bug 8264322
* @summary Test the --generate-cds-archive plugin
Expand All @@ -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");
Expand All @@ -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()) {
Expand Down

3 comments on commit 8302061

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8302061 Apr 29, 2024

Choose a reason for hiding this comment

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

@MBaesken the backport was successfully created on the branch backport-MBaesken-83020617 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 83020617 from the openjdk/jdk repository.

The commit being backported was authored by sunxu on 17 Sep 2021 and was reviewed by Calvin Cheung and Mandy Chung.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-MBaesken-83020617:backport-MBaesken-83020617
$ git checkout backport-MBaesken-83020617
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-MBaesken-83020617

Please sign in to comment.