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

8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java #486

Closed
wants to merge 1 commit into from

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 6, 2021

I backport this for parity with 11.0.14-oracle.

I had to resolve some chunks due to context differences.
Other places did not apply because there are only
test cases up to 10 in the current test.
I added the test cases New11 and New14, they seem
to make sense for 11 now.
I had to undo the text blocks.

Unfortunately "8211148: var in implicit lambdas shouldn't be accepted
for source < 11" is not in 11, so New11 can be compiled with
-source 10. I commented out that test case.
Test is passing this way.


Progress

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

Issue

  • JDK-8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 486

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 6, 2021

👋 Welcome back goetz! 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.

Loading

@openjdk openjdk bot changed the title Backport 6cbf57aa377c3e6edf79f31927e5cea69ef90a1d 8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java Oct 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

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

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 6, 2021

Webrevs

Loading

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 10, 2021

Unfortunately "8211148: var in implicit lambdas shouldn't be accepted for source < 11" is not in 11, so New11 can be compiled with -source 10. I commented out that test case. Test is passing this way.

I assume you'll update this one after you backported 8211148 with #497, right?

Loading

@GoeLin GoeLin force-pushed the goetz_backport_8245147 branch from 5933c1e to 5815098 Oct 11, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Oct 11, 2021

"8211148: var in implicit lambdas shouldn't be accepted for source < 11" was pushed to jdk11u-dev, so I updated the test to also check the difference between 10 and 11.

Loading

@GoeLin GoeLin force-pushed the goetz_backport_8245147 branch from 5815098 to 9be57fd Oct 11, 2021
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

New version LGTM.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Oct 11, 2021

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

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

8245147: Refactor and improve utility of test/langtools/tools/javac/versions/Versions.java

Reviewed-by: mdoerr

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:

  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

Loading

@openjdk openjdk bot added the ready label Oct 11, 2021
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Oct 12, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

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

  • 9512c47: 8273826: Correct Manifest file name and NPE checks
  • bcee700: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character
  • 4e63adb: 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java
  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Oct 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 12, 2021

@GoeLin Pushed as commit aa5d5f3.

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

Loading

@GoeLin GoeLin deleted the goetz_backport_8245147 branch Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants