Skip to content

Commit

Permalink
8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subt…
Browse files Browse the repository at this point in the history 
…est again

8302607: increase timeout for ContinuousCallSiteTargetChange.java
8305502: adjust timeouts in three more M&M tests

Reviewed-by: naoto, lmesnik, thartmann
  • Loading branch information
Daniel D. Daugherty committed Apr 24, 2023
1 parent f32adaf commit 4b23bef
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -28,7 +28,7 @@
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run driver compiler.jsr292.ContinuousCallSiteTargetChange
* @run driver/timeout=180 compiler.jsr292.ContinuousCallSiteTargetChange
*/

package compiler.jsr292;
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -47,7 +47,7 @@
* /test/lib
* @comment generate and compile LoadableClassXXX classes
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
* @run main/othervm
* @run main/othervm/timeout=180
* -XX:-UseGCOverheadLimit
* nsk.monitoring.stress.classload.load001
* classes
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -45,7 +45,7 @@
* /test/lib
* @comment generate and compile LoadableClassXXX classes
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
* @run main/othervm
* @run main/othervm/timeout=180
* -XX:-UseGCOverheadLimit
* nsk.monitoring.stress.classload.load001
* classes
Expand Down
4 changes: 2 additions & 2 deletions test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -45,7 +45,7 @@
* /test/lib
* @comment generate and compile LoadableClassXXX classes
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
* @run main/othervm
* @run main/othervm/timeout=180
* -XX:-UseGCOverheadLimit
* nsk.monitoring.stress.classload.load001
* classes
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
*
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
*
* @run main/othervm/timeout=240 -Xmx8g
* @run main/othervm/timeout=300 -Xmx8g
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
* -Xint
* -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
Expand Down

3 comments on commit 4b23bef

@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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 4b23bef Oct 4, 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 4b23bef Oct 4, 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-4b23bef5 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 4b23bef5 from the openjdk/jdk repository.

The commit being backported was authored by Daniel D. Daugherty on 24 Apr 2023 and was reviewed by Naoto Sato, Leonid Mesnik and Tobias Hartmann.

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-4b23bef5:GoeLin-backport-4b23bef5
$ git checkout GoeLin-backport-4b23bef5
# 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-4b23bef5

Please sign in to comment.