Skip to content
Permalink
Browse files
8257623: vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestD…
…escription.java shouldn't use timeout

Reviewed-by: sspitsyn, dcubed
  • Loading branch information
lmesnik committed Dec 2, 2020
1 parent 93b6ab5 commit 3e89981d98b51b4012c492941bfdcf4106422632
Showing 1 changed file with 1 addition and 1 deletion.
@@ -38,7 +38,7 @@
*
* @library /vmTestbase
* /test/lib
* @run main/othervm/native/manual/timeout=240
* @run main/othervm/native/manual
* -agentlib:resexhausted=-waittime=5
* -XX:-UseGCOverheadLimit
* -Xms16m

3 comments on commit 3e89981

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 3e89981 Dec 2, 2020

Choose a reason for hiding this comment

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

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented on 3e89981 Jul 11, 2022

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 3e89981 Jul 11, 2022

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 3e89981d to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted001/TestDescription.java

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b RealCLanger-backport-3e89981d
$ git fetch --no-tags https://git.openjdk.org/jdk 3e89981d98b51b4012c492941bfdcf4106422632
$ git cherry-pick --no-commit 3e89981d98b51b4012c492941bfdcf4106422632
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3e89981d98b51b4012c492941bfdcf4106422632'

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

Please sign in to comment.