Merge pull request #830 from openzim/latest-gtest-support

Add support to recent googletest framework
openzim · Nov 2, 2023 · 2a810ac · 2a810ac
2 parents e3316a4 + 419b06f
commit 2a810ac
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -170,7 +170,7 @@ jobs:
       HOME: /home/runner
     runs-on: ubuntu-22.04
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2023-10-30"
 
     steps:
       - name: Install dependences

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -17,7 +17,6 @@ jobs:
         distro:
           - debian-unstable
           - debian-bullseye
-          - debian-buster
           - ubuntu-jammy
           - ubuntu-focal
     steps:
@@ -56,13 +55,6 @@ jobs:
         with:
           args: --no-sign
 
-      - uses: legoktm/gh-action-build-deb@debian-buster
-        if: matrix.distro == 'debian-buster'
-        name: Build package for debian-buster
-        id: build-debian-buster
-        with:
-          args: --no-sign
-
       - uses: legoktm/gh-action-build-deb@ubuntu-jammy
         if: matrix.distro == 'ubuntu-jammy'
         name: Build package for ubuntu-jammy

diff --git a/meson.build b/meson.build
@@ -80,7 +80,7 @@ else
     icu_dep = dependency('icu-i18n', required:false, static:static_linkage)
 endif
 
-gtest_dep = dependency('gtest', main:true, fallback:['gtest', 'gtest_main_dep'], required:false)
+gtest_dep = dependency('gtest', version: '>=1.10.0', main:true, fallback:['gtest', 'gtest_main_dep'], required:false)
 
 inc = include_directories('include')
 

diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap
@@ -1,10 +1,16 @@
 [wrap-file]
-directory = googletest-release-1.8.1
+directory = googletest-1.14.0
+source_url = https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz
+source_filename = gtest-1.14.0.tar.gz
+source_hash = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
+patch_filename = gtest_1.14.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.14.0-1/get_patch
+patch_hash = 2e693c7d3f9370a7aa6dac802bada0874d3198ad4cfdf75647b818f691182b50
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-1/gtest-1.14.0.tar.gz
+wrapdb_version = 1.14.0-1
 
-source_url = https://github.com/google/googletest/archive/release-1.8.1.zip
-source_filename = gtest-1.8.1.zip
-source_hash = 927827c183d01734cc5cfef85e0ff3f5a92ffe6188e0d18e909c5efebf28a0c7
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.8.1/1/get_zip
-patch_filename = gtest-1.8.1-1-wrap.zip
-patch_hash = f79f5fd46e09507b3f2e09a51ea6eb20020effe543335f5aee59f30cc8d15805
+[provide]
+gtest = gtest_dep
+gtest_main = gtest_main_dep
+gmock = gmock_dep
+gmock_main = gmock_main_dep
diff --git a/test/compression.cpp b/test/compression.cpp
@@ -39,7 +39,7 @@ using CompressionAlgo = ::testing::Types<
   ZSTD_INFO
 >;
 
-TYPED_TEST_CASE(CompressionTest, CompressionAlgo);
+TYPED_TEST_SUITE(CompressionTest, CompressionAlgo);
 
 TYPED_TEST(CompressionTest, compress) {
   std::string data;

diff --git a/test/decoderstreamreader.cpp b/test/decoderstreamreader.cpp
@@ -60,7 +60,7 @@ using CompressionTypes = ::testing::Types<
   ZSTD_INFO
 >;
 
-TYPED_TEST_CASE(DecoderStreamReaderTest, CompressionTypes);
+TYPED_TEST_SUITE(DecoderStreamReaderTest, CompressionTypes);
 
 TYPED_TEST(DecoderStreamReaderTest, justCompressedData) {
   typedef typename TestFixture::CompressionInfo CompressionInfo;

diff --git a/test/error_in_creator.cpp b/test/error_in_creator.cpp
@@ -184,10 +184,10 @@ TEST_P(FaultyItemErrorTest, faultyItem)
 
 // It would be more natural to put the `#if defined` only around the
 // discarded values, but when crosscompiling on Windows, compiler fail to
-// understand ``#if defined` when used inside the `INSTANTIATE_TEST_CASE_P`
+// understand ``#if defined` when used inside the `INSTANTIATE_TEST_SUITE_P`
 // macro. I suspect some macro definition conflicts.
 #if defined(ENABLE_XAPIAN)
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
 CreatorError,
 FaultyItemErrorTest,
 ::testing::Values(
@@ -200,7 +200,7 @@ ::testing::Values(
     ERRORKIND::GET_INDEXDATA
 ));
 #else
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
 CreatorError,
 FaultyItemErrorTest,
 ::testing::Values(
@@ -354,10 +354,10 @@ TEST_P(FaultyDelayedItemErrorTest, faultyUnfinishedCreator)
 }
 // It would be more natural to put the `#if defined` only around the
 // discarded values, but when crosscompiling on Windows, compiler fail to
-// understand ``#if defined` when used inside the `INSTANTIATE_TEST_CASE_P`
+// understand ``#if defined` when used inside the `INSTANTIATE_TEST_SUITE_P`
 // macro. I suspect some macro definition conflicts.
 #if defined(ENABLE_XAPIAN)
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
 CreatorError,
 FaultyDelayedItemErrorTest,
 ::testing::Values(
@@ -372,7 +372,7 @@ ::testing::Values(
     ERRORKIND::GET_INDEXDATA_POSITION
 ));
 #else
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
 CreatorError,
 FaultyDelayedItemErrorTest,
 ::testing::Values(