[jdk11u-dev] Integrated: 8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again

Amos Shi ashi at openjdk.org
Sat Dec 30 08:57:49 UTC 2023


On Fri, 15 Dec 2023 06:07:33 GMT, Amos Shi <ashi at openjdk.org> wrote:

> Backport of [JDK-8301377](https://bugs.openjdk.org/browse/JDK-8301377). 
> This same fix also fixed the following two tickets
> - [JDK-8302607](https://bugs.openjdk.org/browse/JDK-8302607)
> - [JDK-8305502](https://bugs.openjdk.org/browse/JDK-8305502)
> 
> Unclean Backport:
> - `test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java`
>   - This file has been ignored, because it does not exist in Java 11
>   - Based on [current history](https://github.com/openjdk/jdk/commits/4b23bef51df9c1a5bc8f43748a8d6c8d99995656/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java) This file was added by [JDK-8253525](https://bugs.openjdk.org/browse/JDK-8253525) on Java 16
> - `test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java`
>   - `Copyright year` line manually merged.
>   - `driver/timeout=180` line manually merged
>   - The change is exactly the same as the original [commit](https://github.com/openjdk/jdk/commit/4b23bef51df9c1a5bc8f43748a8d6c8d99995656)
>   - So the change to this file can be considered as `Clean`
> - `test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java`
> - `test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java`
> - `test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java`
>   - For the 3 files above, the only difference is the `Copyright year` line.
>   - Manually merged this line
>   - These 3 files can be considered as `Clean`
> 
> 
> Tests
> - Test Succeeded in local Dev Apple M1 Laptop
> - PR: All checks have passed
> - SAP nightlies passed on `2023-12-23,24`

This pull request has now been integrated.

Changeset: 4f91f8fe
Author:    Amos Shi <ashi at openjdk.org>
Committer: Matthias Baesken <mbaesken at openjdk.org>
URL:       https://git.openjdk.org/jdk11u-dev/commit/4f91f8fe3da30a12d24f174e3606b6afade7174b
Stats:     8 lines in 4 files changed: 0 ins; 0 del; 8 mod

8301377: adjust timeout for JLI GetObjectSizeIntrinsicsTest.java subtest again
8302607: increase timeout for ContinuousCallSiteTargetChange.java
8305502: adjust timeouts in three more M&M tests

Reviewed-by: mbaesken
Backport-of: 4b23bef51df9c1a5bc8f43748a8d6c8d99995656

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/2392


More information about the jdk-updates-dev mailing list