[jdk11u-dev] RFR: 8211727: Adjust default concurrency settings for running tests on Sparc
Christoph Langer
clanger at openjdk.org
Wed Aug 3 09:48:42 UTC 2022
On Tue, 2 Aug 2022 12:44:24 GMT, George Adams <duke at openjdk.org> wrote:
> Backport doesn't apply cleanly due to a diff between https://github.com/openjdk/jdk/blob/03a8cdece5e1dabcae0cd4f7ce9c0165daa1e476/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java and https://github.com/openjdk/jdk11u-dev/blob/master/test/hotspot/jtreg/compiler/jsr292/ContinuousCallSiteTargetChange.java.
>
> This change allows me to merge https://github.com/openjdk/jdk/commit/1804d6ce65816a529489e3058d9a035d8f772f61 and https://github.com/openjdk/jdk/commit/753c58b7f556fedd7828da487a34b8b228785ff9 cleanly
I've reviewed this one now and it gave me a little headache. I initially thought: That's weird, [JDK-8211727](https://bugs.openjdk.org/browse/JDK-8211727) was already backported in 11.0.5 and there's also a [commit](https://github.com/openjdk/jdk11u-dev/commit/2c4aa733a367f3fb2bd6a498053f986d71471448) for it. But looking deeper this unveiled a problem with my later backport of [JDK-8212028](https://bugs.openjdk.org/browse/JDK-8212028) in 11.0.6: https://github.com/openjdk/jdk11u-dev/commit/abcacaefe01e427c7a643b578479e3aedd0b6949.
This introduced section "Setup global test running parameters" in RunTests.gmk again with the old code. That's the part you would be patching now.
So' it's good to fix this. But I would suggest that you create a new JBS issue named "[11u] Repair backport of JDK-8211727". For that, you can use this change and then please remove the duplicate section "Setup global test running parameters" in RunTests.gmk in line 35ff.
Thanks for your efforts!
-------------
PR: https://git.openjdk.org/jdk11u-dev/pull/1302
More information about the jdk-updates-dev
mailing list