Skip to content

Commit

Permalink
8331466: Problemlist serviceability/dcmd/gc/RunFinalizationTest.java …
Browse files Browse the repository at this point in the history 
…on generic-all

Reviewed-by: phh
Backport-of: 440782e0160f867f08afbec0abf48d557a522c72
  • Loading branch information
SendaoYan authored and Paul Hohensee committed Jul 12, 2024
1 parent 5ad9e24 commit 61e2dba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/ProblemList.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ serviceability/sa/sadebugd/DebugdConnectTest.java 8239062,8270326 macosx-x64,mac
serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all

serviceability/jvmti/ModuleAwareAgents/ThreadStart/MAAThreadStart.java 8225354 windows-all
serviceability/dcmd/gc/RunFinalizationTest.java 8227120 linux-all,windows-x64
serviceability/dcmd/gc/RunFinalizationTest.java 8227120 generic-all

serviceability/sa/ClhsdbCDSCore.java 8294316,8267433 macosx-x64
serviceability/sa/ClhsdbFindPC.java#id1 8294316,8267433 macosx-x64
Expand Down

3 comments on commit 61e2dba

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@sendaoYan
Copy link
Member

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 61e2dba Jul 13, 2024

Choose a reason for hiding this comment

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

@sendaoYan Could not automatically backport 61e2dba5 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/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-sendaoYan-61e2dba5-master

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

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

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

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

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

Hi all,

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

The commit being backported was authored by SendaoYan on 12 Jul 2024 and was reviewed by Paul Hohensee.

Thanks!

Please sign in to comment.