[jdk11u-dev] RFR: 8209611: use C++ compiler for hotspot tests
Goetz Lindenmaier
goetz at openjdk.java.net
Thu Nov 18 15:43:41 UTC 2021
On Wed, 17 Nov 2021 08:09:41 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:
> I want to downport this for parity with jdk11.0.x-oracle.
>
> I had to resolve /make/common/TestFilesCompilation.gmk
> One chunk is pointless, as it was changed again by "8210920: Native C++ tests are not using CXXFLAGS"
> which, in head, came after this change, but was already downported to 11u.
> I resolved the other chunk that did not apply to the current syntax in head.
>
> I had to conserve some changes we backported from the .cpp files
> to the .c files and move them over to the new .cpp files:
>
> test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.c
> test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.c
> test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/extmech/extmech.c
>
> In this file, we disable some warnings in 11 with "8232084: HotSpot build failed with GCC 9.2.1"
> I can not check whether the warnings are a problem in cpp, too, so
> I moved the change to the new file:
> test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.c
To verify what I did, I dumped the original and my change, and diffed the changes.
I did it twice, once so that moved files are recognized, and once without. This can be achieved by setting git config merge.renamelimit .
Luckily the change is from 12, so not that far away from 11...
Thanks for reviewing, Matthias!
-------------
PR: https://git.openjdk.java.net/jdk11u-dev/pull/634
More information about the jdk-updates-dev
mailing list