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

8303773: Replace "main.wrapper" with "test.thread.factory" property in test code #444

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Apr 3, 2024

I backport this to streamline testing in 21.
I verified all files where respective tests sit nearby. Others will be used in SAP nightly testing.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8303773 needs maintainer approval

Issue

  • JDK-8303773: Replace "main.wrapper" with "test.thread.factory" property in test code (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 444

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 3, 2024

👋 Welcome back goetz! A progress list of the required criteria for merging this PR into pr/438 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 3, 2024

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

8303773: Replace "main.wrapper" with "test.thread.factory" property in test code

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 89987dbf8789f166fe24e7facf5b8cc9a3c292c2 8303773: Replace "main.wrapper" with "test.thread.factory" property in test code Apr 3, 2024
@openjdk
Copy link

openjdk bot commented Apr 3, 2024

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

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Apr 3, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 3, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Apr 4, 2024

GHA: two test suites did not run at all. infra issue, unrelated. They ran in SAP testing.

@openjdk openjdk bot added approval and removed approval labels Apr 4, 2024
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/438 to master April 4, 2024 20:57
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8303773
git fetch https://git.openjdk.org/jdk21u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Apr 4, 2024
@openjdk openjdk bot added clean ready Pull request is ready to be integrated labels Apr 5, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Apr 5, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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

  • b80fb5e: 8327468: Do not restart close if errno is EINTR [macOS/linux]
  • bdf5747: 8328709: AIX os::get_summary_cpu_info support Power 10
  • c05f3bf: 8328776: [AIX] remove checked_vmgetinfo, use vmgetinfo directly

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

@GoeLin An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

@GoeLin
Copy link
Member Author

GoeLin commented Apr 5, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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

  • b80fb5e: 8327468: Do not restart close if errno is EINTR [macOS/linux]
  • bdf5747: 8328709: AIX os::get_summary_cpu_info support Power 10
  • c05f3bf: 8328776: [AIX] remove checked_vmgetinfo, use vmgetinfo directly

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 5, 2024

@GoeLin Pushed as commit ccaa6d7.

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

@GoeLin GoeLin deleted the goetz_backport_8303773 branch April 5, 2024 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant