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

8264429: Test runtime/cds/appcds/VerifyWithDefaultArchive.java assumes OpenJDK build #3268

Closed
wants to merge 1 commit into from

Conversation

@kelthuzadx
Copy link
Member

@kelthuzadx kelthuzadx commented Mar 30, 2021

The test runtime/cds/appcds/VerifyWithDefaultArchive.java assumes OpenJDK build since it checks for out.shouldContain("OpenJDK"). Relax this restriction now.

Thanks~
Yang


Progress

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

Issue

  • JDK-8264429: Test runtime/cds/appcds/VerifyWithDefaultArchive.java assumes OpenJDK build

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3268/head:pull/3268
$ git checkout pull/3268

Update a local copy of the PR:
$ git checkout pull/3268
$ git pull https://git.openjdk.java.net/jdk pull/3268/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3268

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3268.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 30, 2021

👋 Welcome back yyang! 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 label Mar 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

@kelthuzadx The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 30, 2021

Webrevs

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Thumbs up.

This is a trivial fix and does not need to wait for 24 hours.

Copy link
Contributor

@shipilev shipilev left a comment

Looks fine. Please try to revert the original fix and see if the test still fails?

@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

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

8264429: Test runtime/cds/appcds/VerifyWithDefaultArchive.java assumes OpenJDK build

Reviewed-by: dcubed, 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 12 new commits pushed to 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 (@dcubed-ojdk, @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 the ready label Mar 30, 2021
@kelthuzadx
Copy link
Member Author

@kelthuzadx kelthuzadx commented Mar 30, 2021

Thanks @dcubed-ojdk @shipilev for the reviews, since it's a trivial fix, I think it can be integrated right now.

For @shipilev : Yes, it fails as expected when the original fix was reverted(See detailed VerifyWithDefaultArchive.jtr.log attachment in this PR).

/integrate

@openjdk openjdk bot added the sponsor label Mar 30, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

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

@dcubed-ojdk
Copy link
Member

@dcubed-ojdk dcubed-ojdk commented Mar 30, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Mar 30, 2021

@dcubed-ojdk @kelthuzadx Since your change was applied there have been 12 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit b652198.

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

@kelthuzadx kelthuzadx deleted the kelthuzadx:JDK_8264429 branch Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants