Skip to content

Conversation

@jianglizhou
Copy link
Contributor

@jianglizhou jianglizhou commented Apr 16, 2025

Please review this simple test change that skips the test case loading using JDK libzip.so on static JDK in test/jdk/jdk/internal/loader/NativeLibraries/Main.java. AFAICT, the test case using NativeLibrariesTest.LIB_NAME (libnativeLibrariesTest.so) can provide coverage on static JDK.

Thanks


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8354898: jdk/internal/loader/NativeLibraries/Main.java fails on static JDK (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24704/head:pull/24704
$ git checkout pull/24704

Update a local copy of the PR:
$ git checkout pull/24704
$ git pull https://git.openjdk.org/jdk.git pull/24704/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24704

View PR using the GUI difftool:
$ git pr show -t 24704

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24704.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 16, 2025

👋 Welcome back jiangli! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 16, 2025

@jianglizhou This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8354898: jdk/internal/loader/NativeLibraries/Main.java fails on static JDK

Reviewed-by: jpai

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 94 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 16, 2025
@openjdk
Copy link

openjdk bot commented Apr 16, 2025

@jianglizhou The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 16, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 16, 2025

Webrevs

// load zip library from JDK
test.load(System.mapLibraryName("zip"), true /* succeed */);
if (!Platform.isStatic()) {
test.load(System.mapLibraryName("zip"), true /* succeed */);
Copy link
Member

Choose a reason for hiding this comment

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

Hi, the other tests which also call NativeLibrariesTest.load(String, boolean), does the other tests also need this check !Platform.isStatic()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jaikiran
Copy link
Member

Hello Jiangli, can you add a few more details to the linked JBS issue? If I understand this change correctly, then what's being proposed in this PR seems to indicate that the jdk.internal.loader.RawNativeLibraries is unable to load libzip whose Path is determined by a call to the System.mapLibraryName(...) standard API. I don't currently have access to a static JDK. Can you include the Path that's returned for System.mapLibraryName("zip") on a static JDK?

@jianglizhou
Copy link
Contributor Author

Hello Jiangli, can you add a few more details to the linked JBS issue? If I understand this change correctly, then what's being proposed in this PR seems to indicate that the jdk.internal.loader.RawNativeLibraries is unable to load libzip whose Path is determined by a call to the System.mapLibraryName(...) standard API. I don't currently have access to a static JDK. Can you include the Path that's returned for System.mapLibraryName("zip") on a static JDK?

@jaikiran Added details in https://bugs.openjdk.org/browse/JDK-8354898, thanks for the suggestion. I also added command line examples for building static-jdk and the current method for running jtreg tests on static-jdk.

@jaikiran
Copy link
Member

Thank you Jiangli for the details in the JBS issue. That helped. Having read the documentation of jdk.internal.loader.RawNativeLibraries yesterday:

 * RawNativeLibraries has the following properties:
 * 1. Native libraries loaded in this RawNativeLibraries instance are
 *    not JNI native libraries.  Hence JNI_OnLoad and JNI_OnUnload will
 *    be ignored.  No support for linking of native method.

I mistook that it cannot be used to load JNI libraries and that's what confused me about this test since libzip is a JNI library. But reading this text again, I now realize that it can be used to load a JNI native library, but the loaded library won't be treated as a JNI library by RawNativeLibraries. So the usage of libzip in that test seems OK. I further looked at the change which introduced this usage in that test to understand if it was intentional to use a JNI library here. It appears that it was introduced in https://bugs.openjdk.org/browse/JDK-8281335 and so was an intentional decision to use a JNI library.

Given all this, I think the proposal to skip this loading for static JDK seems reasonable to me.

@jaikiran
Copy link
Member

I also added command line examples for building static-jdk and the current method for running jtreg tests on static-jdk.

Thank you, that will help me in future.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 23, 2025
@jianglizhou
Copy link
Contributor Author

@jaikiran Thank's a lot for the careful review!

@jianglizhou
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 23, 2025

Going to push as commit 12c3a23.
Since your change was applied there have been 112 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 23, 2025
@openjdk openjdk bot closed this Apr 23, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 23, 2025
@openjdk
Copy link

openjdk bot commented Apr 23, 2025

@jianglizhou Pushed as commit 12c3a23.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants