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

8314552: Fix javadoc tests to work with jtreg 7 #2557

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Feb 26, 2024

This is a variant of the fix for JDK 11u, required for jtreg upgrade.

Additional testing:

  • langtools:all passes with jtreg-7.3.1+1 (some known failures fixed by other PRs)

Progress

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

Issue

  • JDK-8314552: Fix javadoc tests to work with jtreg 7 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2557

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 26, 2024

👋 Welcome back shade! 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 openjdk bot changed the title Backport e83046409d81d074cd68dc823e794a852ed93cee 8314552: Fix javadoc tests to work with jtreg 7 Feb 26, 2024
@openjdk
Copy link

openjdk bot commented Feb 26, 2024

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

@openjdk openjdk bot added the backport label Feb 26, 2024
@shipilev shipilev marked this pull request as ready for review February 26, 2024 13:01
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 26, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 26, 2024

Webrevs

@shipilev
Copy link
Member Author

@lutkerd, @gnu-andrew, @phohensee might want to take a look at this one.

@openjdk
Copy link

openjdk bot commented Feb 28, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@shipilev
Copy link
Member Author

/approval request This is a variant of the fix for JDK 11u, required for jtreg upgrade. Reapplied hunks by hand, langtools tests pass with new jtreg. See 11u-dev PR for more details. Test-only change, risk is low.

@openjdk
Copy link

openjdk bot commented Feb 28, 2024

@shipilev
8314552: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Feb 28, 2024
@openjdk
Copy link

openjdk bot commented Feb 29, 2024

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

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

8314552: Fix javadoc tests to work with jtreg 7

Reviewed-by: phh

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 18 new commits pushed to the master branch:

  • 0ae93db: 8323717: Introduce test keyword for tests that need external dependencies
  • 61164ce: 8305962: update jcstress to 0.16
  • f2565a6: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16
  • 0e94be6: 8307955: Prefer to PTRACE_GETREGSET instead of PTRACE_GETREGS in method 'ps_proc.c::process_get_lwp_regs'
  • 2dee6fb: 8294156: Allow PassFailJFrame.Builder to create test UI
  • c681c5a: 8316053: Open some swing tests 3
  • e5cc20c: 8315726: Open source several AWT applet tests
  • fe840ca: 8314830: runtime/ErrorHandling/ tests ignore external VM flags
  • 5045b54: 8214400: Update hotspot application/jcstress jtreg tests wrappers to use jcstress 0.5
  • 6e296a0: 8326801: Bump update version for OpenJDK: jdk-11.0.24
  • ... and 8 more: https://git.openjdk.org/jdk11u-dev/compare/8dc28922c2c3cec9f8b9e9ee623dbd37df748b98...master

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 ready Pull request is ready to be integrated and removed approval labels Feb 29, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 29, 2024

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

  • 0ae93db: 8323717: Introduce test keyword for tests that need external dependencies
  • 61164ce: 8305962: update jcstress to 0.16
  • f2565a6: 8324723: GHA: Upgrade some actions to avoid deprecated Node 16
  • 0e94be6: 8307955: Prefer to PTRACE_GETREGSET instead of PTRACE_GETREGS in method 'ps_proc.c::process_get_lwp_regs'
  • 2dee6fb: 8294156: Allow PassFailJFrame.Builder to create test UI
  • c681c5a: 8316053: Open some swing tests 3
  • e5cc20c: 8315726: Open source several AWT applet tests
  • fe840ca: 8314830: runtime/ErrorHandling/ tests ignore external VM flags
  • 5045b54: 8214400: Update hotspot application/jcstress jtreg tests wrappers to use jcstress 0.5
  • 6e296a0: 8326801: Bump update version for OpenJDK: jdk-11.0.24
  • ... and 8 more: https://git.openjdk.org/jdk11u-dev/compare/8dc28922c2c3cec9f8b9e9ee623dbd37df748b98...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 29, 2024

@shipilev Pushed as commit b183cd2.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants