Skip to content

Commit

Permalink
8297082: Remove sun/tools/jhsdb/BasicLauncherTest.java from problem list
Browse files Browse the repository at this point in the history
Reviewed-by: mbaesken
Backport-of: 012dafee5bc035a2eb27ac5efab9658ade92bf90
  • Loading branch information
RealCLanger committed May 9, 2024
1 parent 5a3c668 commit e552509
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions test/jdk/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -770,8 +770,6 @@ sun/util/locale/provider/CalendarDataRegression.java 8268379 macosx-x

# svc_tools

sun/tools/jhsdb/BasicLauncherTest.java 8211767 linux-ppc64,linux-ppc64le

sun/tools/jstatd/TestJstatdDefaults.java 8081569,8226420 windows-all
sun/tools/jstatd/TestJstatdRmiPort.java 8226420,8251259 windows-all
sun/tools/jstatd/TestJstatdServer.java 8081569,8226420 windows-all
Expand Down

3 comments on commit e552509

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@RealCLanger
Copy link
Contributor Author

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e552509 May 10, 2024

Choose a reason for hiding this comment

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

@RealCLanger Could not automatically backport e552509b to openjdk/jdk11u-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/jdk11u-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/jdk11u-dev.git master:master

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

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

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

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

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

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

Hi all,

This pull request contains a backport of commit e552509b from the openjdk/jdk17u-dev repository.

The commit being backported was authored by Christoph Langer on 9 May 2024 and was reviewed by Matthias Baesken.

Thanks!

Please sign in to comment.