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

8316387: Exclude more failing multicast tests on AIX after JDK-8315651 #173

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 19, 2023

Backport some AIX specific test exclusions.


Progress

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

Issues

  • JDK-8316387: Exclude more failing multicast tests on AIX after JDK-8315651 (Sub-task - P4 - Approved)
  • JDK-8316399: Exclude java/net/MulticastSocket/Promiscuous.java on AIX (Sub-task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 173

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

Using diff file

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

Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 19, 2023

👋 Welcome back clanger! 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 changed the title Backport e62419823a06ebd4499c5fadfc1f53a9bc3f71ce 8316387: Exclude more failing multicast tests on AIX after JDK-8315651 Sep 19, 2023
@openjdk
Copy link

openjdk bot commented Sep 19, 2023

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

@openjdk openjdk bot added the backport label Sep 19, 2023
@RealCLanger
Copy link
Contributor Author

/issue add JDK-8316399

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 19, 2023
@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@RealCLanger
Adding additional issue to issue list: 8316399: Exclude java/net/MulticastSocket/Promiscuous.java on AIX.

@mlbridge
Copy link

mlbridge bot commented Sep 19, 2023

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

⚠️ @RealCLanger This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@RealCLanger
Copy link
Contributor Author

/approval request Add some AIX specific test exclusions.

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@RealCLanger There are multiple issues associated with this pull request, you need to request approval for each one individually.

@RealCLanger
Copy link
Contributor Author

/approval JDK-8316387 request Add some AIX specific test exclusions.

@RealCLanger
Copy link
Contributor Author

/approval JDK-8316399 request Add some AIX specific test exclusions.

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@RealCLanger The approval request has been created successfully.

@openjdk
Copy link

openjdk bot commented Sep 19, 2023

@RealCLanger The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 19, 2023
@openjdk
Copy link

openjdk bot commented Sep 21, 2023

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

8316387: Exclude more failing multicast tests on AIX after JDK-8315651
8316399: Exclude java/net/MulticastSocket/Promiscuous.java on AIX

Reviewed-by: mbaesken

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

  • 2f3e151: 8311813: C1: Uninitialized PhiResolver::_loop field
  • fc11f38: 8315644: increase timeout of sun/security/tools/jarsigner/Warning.java
  • acd23ac: 8316123: ProblemList serviceability/dcmd/gc/RunFinalizationTest.java on AIX
  • 46f210c: 8311514: Incorrect regex in TestMetaSpaceLog.java
  • f885c25: 8316087: Test SignedLoggerFinderTest.java is still failing
  • 2312578: 8315696: SignedLoggerFinderTest.java test failed
  • 51d738b: 8314263: Signed jars triggering Logger finder recursion and StackOverflowError
  • ad222a4: 8299614: Shenandoah: STW mark should keep nmethod/oops referenced from stack chunk alive

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 ready Pull request is ready to be integrated and removed approval labels Sep 21, 2023
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 21, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 21, 2023

@RealCLanger Pushed as commit c86bad5.

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

@RealCLanger RealCLanger deleted the RealCLanger-backport-e6241982 branch September 21, 2023 13:29
@suchismith1993
Copy link

/backport jdk17u-dev

@openjdk
Copy link

openjdk bot commented Jun 20, 2024

@suchismith1993 Could not automatically backport c86bad51 to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/ProblemList.txt

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. 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/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-suchismith1993-c86bad51-master

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

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

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

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport c86bad51a88b867de3cd0b1a50bf544c2111755f.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit c86bad51 from the openjdk/jdk21u repository.

The commit being backported was authored by Christoph Langer on 21 Sep 2023 and was reviewed by Matthias Baesken.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

3 participants