From 303e69cb0eb19509d1d0e972fff1a2ed7a01fe0d Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Tue, 1 Apr 2025 18:38:14 +0000 Subject: [PATCH] googletest: Update to use version 1.2.0 Signed-off-by: Tom Hromatka Acked-by: Kamalesh Babulal --- .github/workflows/continuous-integration.yml | 8 +++++--- bootstrap.sh | 8 +++++--- tests/gunit/Makefile.am | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2c22d71d..1c65f4bc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -215,9 +215,11 @@ jobs: - name: Initialize submodules run: | git submodule update --init --recursive - pushd googletest/googletest - git checkout release-1.8.0 - cmake -DBUILD_SHARED_LIBS=ON . + pushd googletest + git checkout v1.12.0 + mkdir -p build + cd build + cmake .. -DBUILD_GMOCK=OFF make popd - name: Automake diff --git a/bootstrap.sh b/bootstrap.sh index 1244f71a..2e510a1a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -13,9 +13,11 @@ fi git submodule update --init --recursive # configure googletest -pushd googletest/googletest -git checkout release-1.8.0 -cmake -DBUILD_SHARED_LIBS=ON . +pushd googletest +git checkout v1.12.0 +mkdir -p build +cd build +cmake .. -DBUILD_GMOCK=OFF make popd diff --git a/tests/gunit/Makefile.am b/tests/gunit/Makefile.am index ae97a8b4..18c634d0 100644 --- a/tests/gunit/Makefile.am +++ b/tests/gunit/Makefile.am @@ -18,8 +18,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ LDADD = $(top_builddir)/src/.libs/libcgroupfortesting.la \ $(top_builddir)/src/tools/.libs/libcgset.la -EXTRA_DIST = $(top_srcdir)/googletest/googletest/libgtest.so \ - $(top_srcdir)/googletest/googletest/libgtest_main.so \ +EXTRA_DIST = $(top_srcdir)/googletest/build/lib/libgtest.a \ + $(top_srcdir)/googletest/build/lib/libgtest_main.a \ $(top_srcdir)/googletest/googletest/include \ libcgroup_unittest.map @@ -46,7 +46,7 @@ gtest_SOURCES = gtest.cpp \ 017-API_fuzz_test.cpp \ 018-get_next_rule_field.cpp -gtest_LDFLAGS = -L$(top_srcdir)/googletest/googletest -l:libgtest.so \ +gtest_LDFLAGS = -L$(top_srcdir)/googletest/build/lib -l:libgtest.a \ -rpath $(abs_top_srcdir)/googletest/googletest clean-local: -- 2.47.3