Skip to content

Commit

Permalink
8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent…
Browse files Browse the repository at this point in the history
… mark with -Xcomp

Reviewed-by: ayang, iwalulya
  • Loading branch information
Thomas Schatzl committed Aug 16, 2023
1 parent b80001d commit 1925508
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions test/hotspot/jtreg/gc/g1/ihop/TestIHOPErgo.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
* @requires !vm.flightRecorder
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
* @requires vm.opt.MaxGCPauseMillis == "null"
* @requires vm.compMode != "Xcomp"
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
* @requires vm.gc.G1
* @requires !vm.flightRecorder
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
* @requires !(vm.graal.enabled & vm.compMode == "Xcomp")
* @requires !vm.graal.enabled
* @requires vm.compMode != "Xcomp"
* @requires os.maxMemory > 1G
* @library /test/lib /
* @modules java.base/jdk.internal.misc
Expand Down

5 comments on commit 1925508

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 1925508 Oct 26, 2023

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1925508 Oct 26, 2023

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-19255084 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 19255084 from the openjdk/jdk repository.

The commit being backported was authored by Thomas Schatzl on 16 Aug 2023 and was reviewed by Albert Mingkun Yang and Ivan Walulya.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-19255084:GoeLin-backport-19255084
$ git checkout GoeLin-backport-19255084
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git GoeLin-backport-19255084

@luchenlin
Copy link

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 1925508 Jan 29, 2024

Choose a reason for hiding this comment

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

@luchenlin Could not automatically backport 19255084 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/gc/g1/ihop/TestIHOPStatic.java

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-luchenlin-19255084

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

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

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

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

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

Hi all,

This pull request contains a backport of commit 19255084 from the openjdk/jdk repository.

The commit being backported was authored by Thomas Schatzl on 16 Aug 2023 and was reviewed by Albert Mingkun Yang and Ivan Walulya.

Thanks!

Please sign in to comment.