[11u] RFR 8222154: upgrade gtest to 1.8.1
Langer, Christoph
christoph.langer at sap.com
Fri Sep 13 13:02:40 UTC 2019
Hi,
please review the backport of the gtest upgrade to 1.8.1 to JDK11 updates.
Bug: https://bugs.openjdk.java.net/browse/JDK-8222154
Webrev: http://cr.openjdk.java.net/~clanger/webrevs/8222154.11u-dev.0/
The patch applied, apart from a little manual intervention in in make/hotspot/lib/CompileGtest.gmk where I had to find the correct place to remove the DISABLED_WARNINGS_microsoft setting.
Unfortunately, on Solaris the Sun Studio SS12U4 compiler didn't completely like the patch. I had to do the following things:
1. add the +d option (disable inlining) for Solaris in make/hotspot/lib/CompileGtest.gmk, line 75, to get rid of an assertion: (../lnk/vardescr.h, line 109)
2. In test/fmw/gtest/include/gtest/internal/gtest-internal.h, the new struct CodeLocation uses a member 'file' of type std::string. SunStudio12u4 does not like it and the workaround is to convert it to const char* const. With that little tweak and removal of a few .c_str() calls, e.g. in test/fmw/gtest/include/gtest/gtest.h and test/fmw/gtest/src/gtest.cc, the thing compiles on Solaris (and also on the other platforms).
We didn't spot regressions with the new gtests version, so it should be fine to pull it to 11u.
Thanks
Christoph
More information about the jdk-updates-dev
mailing list