-
Notifications
You must be signed in to change notification settings - Fork 208
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
Conversation
👋 Welcome back lutkerd! A progress list of the required criteria for merging this PR into |
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 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. |
And now we hit the GCC version issue.... |
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 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. |
Updated the target, let's see how this goes. |
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. |
Thanks for fixing this! |
You need to update the branch please so that it can be marked ready. |
@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. |
Rebased and updated to target master so it can be merged on its own. |
@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:
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
Please see this link for an up-to-date comparison between the source branch of this pull request and the 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still good.
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). |
There was a problem hiding this 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.
/integrate |
/sponsor |
Going to push as commit e830464.
Your commit was automatically rebased without conflicts. |
@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. |
Updating the tests to specify a UTF-8 encoding so that they work with jtreg-7 and the embedded testng jar.
All tests pass.
Progress
Issue
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