googletest: Update to use version 1.2.0

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Acked-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 2c22d71d0b37ada75d5acd1b383ce83578252d65..1c65f4bc7484c7349b67318f8a8b0eaff1685e62 100644 (file)
--- 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 1244f71a39df0d37fd970827c45ba153ce29ec93..2e510a1a3404303a2f71b4343471615f9b2a70ed 100755 (executable)
--- 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 ae97a8b4ffad0ff73fce861475ed3145d03e42c7..18c634d0b3984110c7408f216f5f3e8b5fa3f2ff 100644 (file)
--- 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: