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

8213922: fix ctw stand-alone build #101

Closed
wants to merge 2 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jul 6, 2021

This allows CTW bundle to be built again. Note that it is unclean backport, and it includes the part of "8214917: CTW testlibrary shouldn't ignore errors raised by the library itself" -- which is already quite messy, and would be inconvenient to work in through the regular process.

Additional testing:

  • Standalone CTW build with JDK 11 now works
  • Sample standalone CTW run with JDK 11 works

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/101/head:pull/101
$ git checkout pull/101

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 101

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/101.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 6, 2021

👋 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 e53852dd51f473587297c1631b2f07f594e43e0a 8213922: fix ctw stand-alone build Jul 6, 2021
@openjdk
Copy link

openjdk bot commented Jul 6, 2021

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 Jul 6, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 6, 2021

Webrevs

Copy link
Contributor

@rwestrel rwestrel left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk
Copy link

openjdk bot commented Jul 6, 2021

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

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

8213922: fix ctw stand-alone build

Reviewed-by: roland

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 the ready Pull request is ready to be integrated label Jul 6, 2021
@shipilev
Copy link
Member Author

shipilev commented Jul 6, 2021

@RealCLanger, are you good with picking up the additional hunk for the unclean backport?

@RealCLanger
Copy link
Contributor

@RealCLanger, are you good with picking up the additional hunk for the unclean backport?

yes, seems reasonable.

@shipilev
Copy link
Member Author

shipilev commented Jul 6, 2021

Good, thanks.

/integrate

@openjdk
Copy link

openjdk bot commented Jul 6, 2021

Going to push as commit c1deb0c.

@openjdk openjdk bot closed this Jul 6, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 6, 2021
@openjdk
Copy link

openjdk bot commented Jul 6, 2021

@shipilev Pushed as commit c1deb0c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@shipilev shipilev deleted the JDK-8213922 branch July 28, 2021 07:48
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
3 participants