From ab40fa56b32293781da0a94de2bad0e228560e60 Mon Sep 17 00:00:00 2001 From: Vladimir Petko Date: Mon, 29 Jan 2024 00:07:10 +0100 Subject: [PATCH] Add support for building with the system google test Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openjdk-20/+bug/2012316 Last-Update: 2023-07-20 A major portion of hotspot tests require google test. In order to get tier1 tests passing the package should build with the system google test. Gbp-Pq: Name build_gtest.patch --- make/autoconf/lib-tests.m4 | 2 ++ test/hotspot/gtest/gtestMain.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4 index c7b136da1..8f97480af 100644 --- a/make/autoconf/lib-tests.m4 +++ b/make/autoconf/lib-tests.m4 @@ -43,6 +43,8 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST], AC_MSG_CHECKING([for gtest]) if test "x${with_gtest}" = xno; then AC_MSG_RESULT([no, disabled]) + elif test "x${with_gtest}" = xsystem; then + GTEST_FRAMEWORK_SRC=/usr/src/googletest elif test "x${with_gtest}" = xyes; then AC_MSG_RESULT([no, error]) AC_MSG_ERROR([--with-gtest must have a value]) diff --git a/test/hotspot/gtest/gtestMain.cpp b/test/hotspot/gtest/gtestMain.cpp index ae50e96da..0f4ddd4ca 100644 --- a/test/hotspot/gtest/gtestMain.cpp +++ b/test/hotspot/gtest/gtestMain.cpp @@ -230,7 +230,9 @@ static void runUnitTestsInner(int argc, char** argv) { bool is_vmassert_test = false; bool is_othervm_test = false; // death tests facility is used for both regular death tests, other vm and vmassert tests - if (::testing::internal::GTEST_FLAG(internal_run_death_test).length() > 0) { +using namespace ::testing; +using namespace ::testing::internal; + if (GTEST_FLAG(internal_run_death_test).length() > 0) { // when we execute death test, filter value equals to test name const char* test_name = ::testing::GTEST_FLAG(filter).c_str(); const char* const othervm_suffix = "_other_vm"; // TEST_OTHER_VM -- 2.30.2