Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Apr 23, 2024

Simplifes test maintenance, matches the test format to mainline, provides 21.0.4-oracle parity.

Since the original change was done after JDK 22, I had to resolve conflicts by removing the JDK 22 blocks.

Additional testing:

  • MacOS AArch64 server fastdebug, affected test passes

Progress

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

Issues

  • JDK-8309142: Refactor test/langtools/tools/javac/versions/Versions.java (Enhancement - P4 - Approved)
  • JDK-8321182: SourceExample.SOURCE_14 comment should refer to 'switch expressions' instead of 'text blocks' (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 525

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 23, 2024

👋 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
Copy link

openjdk bot commented Apr 23, 2024

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

8309142: Refactor test/langtools/tools/javac/versions/Versions.java
8321182: SourceExample.SOURCE_14 comment should refer to 'switch expressions' instead of 'text blocks'

Reviewed-by: phh

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

  • 031acf1: 8327096: (fc) java/nio/channels/FileChannel/Size.java fails on partition incapable of creating large files
  • 324cef1: 8327971: Multiple ASAN errors reported for metaspace
  • ac402fb: 8293850: need a largest_committed metric for each category of NMT's output
  • febbf35: 8316242: Opensource SwingGraphics manual test
  • 1861655: 8316154: Opensource JTextArea manual tests
  • a36d3de: 8328957: Update PKCS11Test.java to not use hardcoded path
  • bb046b7: 8320525: G1: G1UpdateRemSetTrackingBeforeRebuild::distribute_marked_bytes accesses partially unloaded klass
  • ffdde9c: 8320331: G1 Full GC Heap verification relies on metadata not reset before verification
  • d11a065: 8187759: Background not refreshed when painting over a transparent JFrame
  • 5880551: 8318854: [macos14] Running any AWT app prints Secure coding warning
  • ... and 9 more: https://git.openjdk.org/jdk21u-dev/compare/515783b86c5efae1f5385b4bc869869af58cb5bc...master

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.

@openjdk openjdk bot changed the title Backport 7d82479096d9ecc14881bf9b639507eee43f547b 8309142: Refactor test/langtools/tools/javac/versions/Versions.java Apr 23, 2024
@openjdk
Copy link

openjdk bot commented Apr 23, 2024

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Apr 23, 2024
@shipilev
Copy link
Member Author

/issue add 8321182

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 23, 2024
@openjdk
Copy link

openjdk bot commented Apr 23, 2024

@shipilev
Adding additional issue to issue list: 8321182: SourceExample.SOURCE_14 comment should refer to 'switch expressions' instead of 'text blocks'.

@shipilev
Copy link
Member Author

/approval 8309142 request Simplifes test maintenance, matches the test format to mainline, provides 21.0.4-oracle parity. Since the original change was done after JDK 22, I had to resolve conflicts by removing the JDK 22 blocks. Affected test passes.

/approval 8321182 request Follow-up for JDK-8309142. Affected test passes.

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

@shipilev
8309142: The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Apr 23, 2024

@shipilev
8321182: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Apr 23, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 23, 2024

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Apr 25, 2024
@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2024

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

  • e59f4fa: 8328194: Add a test to check default rendering engine
  • 6f07ee4: 8324733: [macos14] Problem list tests which fail due to macOS bug described in JDK-8322653
  • 262cacb: 8320061: [nmt] Multiple issues with peak accounting
  • 1d01cd7: 8315889: Open source several Swing HTMLDocument related tests
  • 2331bc7: 8329013: StackOverflowError when starting Apache Tomcat with signed jar
  • 68d0925: 8324933: ConcurrentHashTable::statistics_calculate synchronization is expensive
  • 2626d73: 8327989: java/net/httpclient/ManyRequest.java should not use "localhost" in URIs
  • 9c0e18c: 8320924: Improve heap dump performance by optimizing archived object checks
  • 41237fc: 8320707: Virtual thread test updates
  • 955fcc1: 8310355: Move the stub test from initialize_final_stubs() to test/hotspot/gtest
  • ... and 19 more: https://git.openjdk.org/jdk21u-dev/compare/515783b86c5efae1f5385b4bc869869af58cb5bc...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 29, 2024
@openjdk openjdk bot closed this Apr 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 29, 2024
@openjdk
Copy link

openjdk bot commented Apr 29, 2024

@shipilev Pushed as commit d1b97d4.

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

@shipilev shipilev deleted the JDK-8309142-versions-test-refactor branch January 8, 2025 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants