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

8342787: Move misplaced TestTemplateAssertionPredicateWithTwoUCTs.java from src to test directory #21629

Closed
wants to merge 1 commit into from

Conversation

chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Oct 22, 2024

For some unknown reason, TestTemplateAssertionPredicateWithTwoUCTs.java ended up in the src directory instead of the test directory with JDK-8342287. Maybe a patch application have gone wrong when moving the test to another checked out JDK repository. Anyway, this patch moves it to the correct place.

Thanks to @TheShermanTanker for spotting this!


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

Issue

  • JDK-8342787: Move misplaced TestTemplateAssertionPredicateWithTwoUCTs.java from src to test directory (Bug - P5)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21629/head:pull/21629
$ git checkout pull/21629

Update a local copy of the PR:
$ git checkout pull/21629
$ git pull https://git.openjdk.org/jdk.git pull/21629/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21629

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21629.diff

Webrev

Link to Webrev Comment

Sorry, something went wrong.

…a from src to test directory
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 22, 2024

👋 Welcome back chagedorn! 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 Oct 22, 2024

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

8342787: Move misplaced TestTemplateAssertionPredicateWithTwoUCTs.java from src to test directory

Reviewed-by: thartmann, shade, jwaters

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

  • bf92c49: 8342704: GHA: Report truncation is broken after JDK-8341424
  • 8bcd492: 8342681: TestLoadBypassesNullCheck.java fails improperly specified VM option
  • 7133d1b: 8342609: jpackage test helper function incorrectly removes a directory instead of its contents only
  • 8276a41: 8342715: x86 unused orw instruction encoding could be removed
  • 5a4b180: 8342011: Conditionally compile ReservedHeapSpace compressed heap support
  • e0c6480: 8338570: sun/font/HBShaper - mismatch in return type of FFM upcall function description and native invocation
  • 7158322: 8340477: Remove JDK1.1 compatible behavior for "EST", "MST", and "HST" time zones
  • 97c9212: 8342698: Fix order of @param tags in module java.base
  • 51a7ff6: 8335271: Specify the MessageFormat ArgumentIndex Implementation Limit
  • 52d752c: 8339507: Test generation tool and gtest for testing APX encoding of extended gpr instructions
  • ... and 14 more: https://git.openjdk.org/jdk/compare/680dc5d896f4f7b01b3cf800d548e32bb2ef8c81...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 added the rfr Pull request is ready for review label Oct 22, 2024
@openjdk
Copy link

openjdk bot commented Oct 22, 2024

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

  • hotspot-compiler

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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Oct 22, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 22, 2024

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann 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 and trivial.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 22, 2024
@TheShermanTanker
Copy link
Contributor

Not sure whether this ends with a newline or not (I think it does), but thanks for fixing this!

@chhagedorn
Copy link
Member Author

Thanks @TobiHartmann, @shipilev, and @TheShermanTanker for the quick reviews!

Not sure whether this ends with a newline or not (I think it does), but thanks for fixing this!

It does, there were two new lines, so I removed one. Github will show a special "no-new-line" icon otherwise :-)

@chhagedorn
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 22, 2024

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

  • de441c2: 8342633: javax/management/security/HashedPasswordFileTest.java creates tmp file in src dir
  • bf92c49: 8342704: GHA: Report truncation is broken after JDK-8341424
  • 8bcd492: 8342681: TestLoadBypassesNullCheck.java fails improperly specified VM option
  • 7133d1b: 8342609: jpackage test helper function incorrectly removes a directory instead of its contents only
  • 8276a41: 8342715: x86 unused orw instruction encoding could be removed
  • 5a4b180: 8342011: Conditionally compile ReservedHeapSpace compressed heap support
  • e0c6480: 8338570: sun/font/HBShaper - mismatch in return type of FFM upcall function description and native invocation
  • 7158322: 8340477: Remove JDK1.1 compatible behavior for "EST", "MST", and "HST" time zones
  • 97c9212: 8342698: Fix order of @param tags in module java.base
  • 51a7ff6: 8335271: Specify the MessageFormat ArgumentIndex Implementation Limit
  • ... and 15 more: https://git.openjdk.org/jdk/compare/680dc5d896f4f7b01b3cf800d548e32bb2ef8c81...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 22, 2024

@chhagedorn Pushed as commit 2da7f2b.

💡 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
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

4 participants