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 #1672

Closed
wants to merge 1 commit into from

Conversation

lutkerd
Copy link
Contributor

@lutkerd lutkerd commented Aug 17, 2023

Updating the tests to specify a UTF-8 encoding so that they work with jtreg-7 and the embedded testng jar.

bash ./configure --with-jtreg=jtreg-7.3+1
make images
make run-test TEST="jtreg:test/langtools/jdk/javadoc/doclet"

All tests pass.


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-8314552: Fix javadoc tests to work with jtreg 7 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1672

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

Using diff file

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

Webrev

Link to Webrev Comment

@lutkerd lutkerd mentioned this pull request Aug 17, 2023
3 tasks
@bridgekeeper
Copy link

bridgekeeper bot commented Aug 17, 2023

👋 Welcome back lutkerd! 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 added the rfr Pull request is ready for review label Aug 17, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 17, 2023

Webrevs

@gnu-andrew
Copy link
Member

Can you make this target pr/1595 instead of master? Then we can see if it fixes the issue we're seeing on that PR.

The tests work for me locally with JTReg 7 without this patch. We need to know if fixes things in GHA.

Thanks.

@lutkerd lutkerd changed the base branch from master to pr/1595 August 18, 2023 04:15
@openjdk
Copy link

openjdk bot commented Aug 18, 2023

@lutkerd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@lutkerd
Copy link
Contributor Author

lutkerd commented Aug 18, 2023

Can you make this target pr/1595 instead of master? Then we can see if it fixes the issue we're seeing on that PR.

The tests work for me locally with JTReg 7 without this patch. We need to know if fixes things in GHA.

Thanks.

And now we hit the GCC version issue....
Can you forward port openjdk/jdk11u-dev#2087 and then we can target pr/1595 onto that and maybe all should work?

@gnu-andrew
Copy link
Member

gnu-andrew commented Aug 18, 2023

Done: #1673

Note that this would probably be resolved by merging with jdk17u-dev/master alone, as I did first (the versions were bumped after 1595 was made), but you may as well just make this dependent on 1673 now.

@lutkerd lutkerd changed the base branch from pr/1595 to pr/1673 August 18, 2023 16:58
@openjdk
Copy link

openjdk bot commented Aug 18, 2023

@lutkerd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@lutkerd
Copy link
Contributor Author

lutkerd commented Aug 18, 2023

Updated the target, let's see how this goes.

@shipilev
Copy link
Member

shipilev commented Aug 22, 2023

This PR does not need to depend on openjdk:pr/1673. Current jdk17u-dev should compile fine, it is just your personal fork is way too old: "This branch is 1 commit ahead, 1480 commits behind openjdk:master."

Please pull new jdk17u-dev to your personal fork, and then rebase for new master. This will let you integrate this PR without waiting unnecessarily for openjdk:pr/1673 to integrate.

@GoeLin
Copy link
Member

GoeLin commented Aug 22, 2023

Thanks for fixing this!

@GoeLin
Copy link
Member

GoeLin commented Aug 22, 2023

You need to update the branch please so that it can be marked ready.

@lutkerd lutkerd changed the base branch from pr/1673 to master August 22, 2023 15:46
@openjdk
Copy link

openjdk bot commented Aug 22, 2023

@lutkerd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@lutkerd
Copy link
Contributor Author

lutkerd commented Aug 22, 2023

Rebased and updated to target master so it can be merged on its own.

@openjdk
Copy link

openjdk bot commented Aug 22, 2023

@lutkerd 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:

8314552: Fix javadoc tests to work with jtreg 7

Reviewed-by: phh, shade, andrew

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

  • 49ffbcf: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • d35a896: 8293851: hs_err should print more stack in hex dump
  • 3f8e995: 8314658: [17u] GHA: Sync up debian-version for cross-builds

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee, @shipilev, @gnu-andrew) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 22, 2023
Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Still good.

@gnu-andrew
Copy link
Member

This PR does not need to depend on openjdk:pr/1673. Current jdk17u-dev should compile fine, it is just your personal fork is way too old: "This branch is 1 commit ahead, 1480 commits behind openjdk:master."

Please pull new jdk17u-dev to your personal fork, and then rebase for new master. This will let you integrate this PR without waiting unnecessarily for openjdk:pr/1673 to integrate.

Yes, as I mentioned above. This was just a quick way to see if it would make the tests pass. There's actually no reason for this to even wait on the JTreg update as it's independent of that (and GHA show tests passing).

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Changes look good and pass on both JTreg 6 & 7. Approved for 17u.

@lutkerd
Copy link
Contributor Author

lutkerd commented Aug 23, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 23, 2023
@openjdk
Copy link

openjdk bot commented Aug 23, 2023

@lutkerd
Your change (at version a42733a) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 23, 2023

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

  • 49ffbcf: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • d35a896: 8293851: hs_err should print more stack in hex dump
  • 3f8e995: 8314658: [17u] GHA: Sync up debian-version for cross-builds

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 23, 2023

@phohensee @lutkerd Pushed as commit e830464.

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

Successfully merging this pull request may close these issues.

5 participants