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

8307732: build-test-lib is broken #1801

Closed
wants to merge 3 commits into from

Conversation

vish-chan
Copy link

@vish-chan vish-chan commented Sep 27, 2023

  • This PR backports JDK-8274345, JDK-8303922, JDK-8307732 to jdk17u-dev. The build-test-lib target is broken on jdk17 and is needed to build wb.jar and test-lib.jar.
  • make build-test-lib works as expected after the change.

Progress

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

Issues

  • JDK-8307732: build-test-lib is broken (Bug - P4 - Approved)
  • JDK-8274345: make build-test-lib is broken (Bug - P4 - Approved)
  • JDK-8303922: build-test-lib target is broken (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1801

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 27, 2023

👋 Welcome back vish-chan! 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 0da48f19cbebe0730d689cb966b886f6f73fb3f1 8307732: build-test-lib is broken Sep 27, 2023
@openjdk
Copy link

openjdk bot commented Sep 27, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Sep 27, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 27, 2023

Webrevs

@shipilev
Copy link
Member

I was confused a bit why this backport is not marked by bots as clean.

Digging a bit, this PR is effectively a combination of three others, right?
https://bugs.openjdk.org/browse/JDK-8274345
https://bugs.openjdk.org/browse/JDK-8303922
https://bugs.openjdk.org/browse/JDK-8307732

Are they applying cleanly as the series?

@parttimenerd
Copy link
Contributor

Thanks for the backport :)

bobpengxie and others added 3 commits September 27, 2023 13:56
@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan 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.

@vish-chan
Copy link
Author

/issue add 8274345,8303922,8307732

@vish-chan
Copy link
Author

I've updated the PR with a stack of clean commits.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan
Adding additional issue to issue list: 8274345: make build-test-lib is broken.

Adding additional issue to issue list: 8303922: build-test-lib target is broken.
This issue is referenced in the PR title - it will now be updated.

@shipilev
Copy link
Member

shipilev commented Sep 27, 2023

Aha! So we missed the hunk in test/lib/jdk/test/lib/hexdump/ASN1Formatter.java, which new PR now has. Very nice!

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

⚠️ @vish-chan 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.

@vish-chan
Copy link
Author

/approval request Fixes build-test-lib target. Applies as stack of three clean commits. make build-test-lib now works.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan There are multiple issues associated with this pull request, you need to request approval for each one individually.

@vish-chan
Copy link
Author

/approval JDK-8274345 request Fixes build-test-lib target. Applies as stack of three clean commits. make build-test-lib now works.
/approval JDK-8303922 request Fixes build-test-lib target. Applies as stack of three clean commits. make build-test-lib now works.
/approval JDK-8307732 request Fixes build-test-lib target. Applies as stack of three clean commits. make build-test-lib now works.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Sep 27, 2023

@vish-chan The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 27, 2023
@GoeLin
Copy link
Member

GoeLin commented Sep 28, 2023

/approve yes 8274345,8303922,8307732

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin usage: /approve [<id>] (yes|no)

@GoeLin
Copy link
Member

GoeLin commented Sep 28, 2023

/approve 8274345,8303922,8307732 yes

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin usage: /approve [<id>] (yes|no)

@GoeLin
Copy link
Member

GoeLin commented Sep 28, 2023

/approve 8274345 yes

@GoeLin
Copy link
Member

GoeLin commented Sep 28, 2023

/approve 8303922 yes

@GoeLin
Copy link
Member

GoeLin commented Sep 28, 2023

/approve 8307732 yes

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin
8274345: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin
8303922: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin
8307732: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

⚠️ @vish-chan the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout build-test-lib
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@vish-chan 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:

8307732: build-test-lib is broken
8274345: make build-test-lib is broken
8303922: build-test-lib target is broken

Reviewed-by: shade

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

  • 0ce7d86: 8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes
  • 4ecf818: 8276054: JMH benchmarks for Fences
  • 8961594: 8300997: Add curl support to createJMHBundle.sh
  • e7fc89d: 8313322: RISC-V: implement MD5 intrinsic

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 (@shipilev) 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 ready Pull request is ready to be integrated and removed approval labels Sep 28, 2023
@vish-chan
Copy link
Author

/integrate

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

openjdk bot commented Sep 28, 2023

@vish-chan
Your change (at version ccb984e) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

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

  • 0ce7d86: 8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes
  • 4ecf818: 8276054: JMH benchmarks for Fences
  • 8961594: 8300997: Add curl support to createJMHBundle.sh
  • e7fc89d: 8313322: RISC-V: implement MD5 intrinsic

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 28, 2023
@openjdk openjdk bot closed this Sep 28, 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 Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@shipilev @vish-chan Pushed as commit 486a468.

💡 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.

5 participants