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

JDK-8309957 Rename JDK-8309595 test to conform #14453

Closed
wants to merge 1 commit into from

Conversation

JimLaskey
Copy link
Member

@JimLaskey JimLaskey commented Jun 13, 2023

As a matter of style, tests are typically in a class whose name begins Test in a directory whose name begins test.


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-8309957: Rename JDK-8309595 test to conform (Task - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14453

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2023

👋 Welcome back jlaskey! 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 Pull request is ready for review label Jun 13, 2023
@openjdk
Copy link

openjdk bot commented Jun 13, 2023

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

  • javadoc

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 javadoc javadoc-dev@openjdk.org label Jun 13, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 13, 2023

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

8309957: Rename JDK-8309595 test to conform

Reviewed-by: rriggs

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

  • e3d6fc8: 8309847: FrameForm and RegisterForm constructors should initialize all members
  • bd79db3: 8309613: [Windows] hs_err files sometimes miss information about the code containing the error
  • 63fe413: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
  • ba837b4: 8309910: Introduce jdk.internal.net.http.HttpConnection.getSNIServerNames() method
  • 5d19319: 8309878: Reduce inclusion of resolvedIndyEntry.hpp
  • 8aad881: 8309934: Update GitHub Actions to use JDK 17 for building jtreg
  • 9bfe415: 8305104: Remove the old core reflection implementation
  • bfef3c3: 8309955: Matcher uses @SInCE {@inheritdoc}
  • d7251c1: 8309757: com/sun/jdi/ReferrersTest.java fails with virtual test thread factory

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 13, 2023
@JimLaskey
Copy link
Member Author

/integrate

@JimLaskey
Copy link
Member Author

/backport jdk21

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

  • e3d6fc8: 8309847: FrameForm and RegisterForm constructors should initialize all members
  • bd79db3: 8309613: [Windows] hs_err files sometimes miss information about the code containing the error
  • 63fe413: 8309890: TestStringDeduplicationInterned.java waits for the wrong condition
  • ba837b4: 8309910: Introduce jdk.internal.net.http.HttpConnection.getSNIServerNames() method
  • 5d19319: 8309878: Reduce inclusion of resolvedIndyEntry.hpp
  • 8aad881: 8309934: Update GitHub Actions to use JDK 17 for building jtreg
  • 9bfe415: 8305104: Remove the old core reflection implementation
  • bfef3c3: 8309955: Matcher uses @SInCE {@inheritdoc}
  • d7251c1: 8309757: com/sun/jdi/ReferrersTest.java fails with virtual test thread factory

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 14, 2023

@JimLaskey Pushed as commit 1d1ed0d.

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

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@JimLaskey Could not automatically backport 1d1ed0d8 to openjdk/jdk21 due to conflicts in the following files:

  • test/langtools/jdk/javadoc/doclet/testUnnamed/TestUnnamed.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b JimLaskey-backport-1d1ed0d8

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 1d1ed0d8f7af28ce2a394f020f1732c2d9f9daac

# Backport the commit
$ git cherry-pick --no-commit 1d1ed0d8f7af28ce2a394f020f1732c2d9f9daac
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 1d1ed0d8f7af28ce2a394f020f1732c2d9f9daac'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21 with the title Backport 1d1ed0d8f7af28ce2a394f020f1732c2d9f9daac.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
2 participants