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

8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used #2321

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

SoniaZaldana
Copy link
Member

@SoniaZaldana SoniaZaldana commented Mar 22, 2024

Hi all,

This PR contains a backport of 43c6f0b5880899b797fab2f851bd35be1c342439.

Patch is not clean. Test won't build in 17 because it can't find import jdk.internal.util.OperatingSystem.

This class was introduced in 21 as part of JDK-8303485.

I've worked around that by removing the dependency to that utility function and checking the operating system with test/lib/jdk/test/lib/Platform.java.

Testing:

  • Modified test case passes

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
  • JDK-8326591 needs maintainer approval

Issue

  • JDK-8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used (Bug - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2321/head:pull/2321
$ git checkout pull/2321

Update a local copy of the PR:
$ git checkout pull/2321
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2321/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2321

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2321.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2024

👋 Welcome back szaldana! A progress list of the required criteria for merging this PR into pr/2305 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 Mar 22, 2024

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 43c6f0b5880899b797fab2f851bd35be1c342439 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label Mar 22, 2024
@SoniaZaldana SoniaZaldana marked this pull request as ready for review March 22, 2024 14:11
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 22, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2024

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 19, 2024

@SoniaZaldana This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

⚠️ @SoniaZaldana This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@GoeLin
Copy link
Member

GoeLin commented Apr 25, 2024

Hi Sonia,
the usual way would be to use test/lib/jdk/test/lib/Platform.java instead of System.getProperty("os.name").

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2305 to master April 28, 2024 20:15
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout my-backport-8326591
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@amosshi
Copy link
Contributor

amosshi commented Apr 30, 2024

SAP nightlies passed on 2024-05-01

  • Automated jtreg test: jtreg_jdk_tier1
  • jdk/modules/etc/JmodExcludedFiles.java: SUCCESSFUL GitHub 📊⏲ - [526 msec]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfr Pull request is ready for review
3 participants