Merge pull request #3038 from MirServer/drop-obsolete-gtest-version-h…

…ackery Drop support for ancient gtest versions
canonical · Sep 11, 2023 · afb3f93 · afb3f93
2 parents 4dd5338 + cc70a5c
commit afb3f93
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 117 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,67 +1,3 @@
-# get a gtest version string the regex will match
-if (GTEST_FOUND AND GTEST_MAIN_FOUND)
-  set(GTEST_VERSION_STR ${GTEST_VERSION})
-  set(GTEST_DETECTION_METHOD "pkg-config")
-elseif (DEFINED ENV{GTEST_VERSION})
-  set(GTEST_VERSION_STR $ENV{GTEST_VERSION})
-  set(GTEST_DETECTION_METHOD "GTEST_VERSION environment variable")
-else()
-  find_program(APT_EXECUTABLE
-    NAMES "apt")
-  find_program(RPM_EXECUTABLE
-    NAMES "rpm")
-  find_program(PACMAN_EXECUTABLE
-    NAMES "pacman")
-  find_program(GTEST_CONFIG_EXECUTABLE
-    NAMES "gtest-config" "gtest-conf")
-  if(APT_EXECUTABLE)
-    EXEC_PROGRAM(${APT_EXECUTABLE} "/"
-      ARGS "policy" "libgtest-dev"
-      OUTPUT_VARIABLE GTEST_VERSION_STR)
-    set(GTEST_DETECTION_METHOD "output of apt")
-  elseif(RPM_EXECUTABLE)
-    EXEC_PROGRAM(${RPM_EXECUTABLE} "/"
-      ARGS "-q" "gtest-devel"
-      OUTPUT_VARIABLE GTEST_VERSION_STR)
-    set(GTEST_DETECTION_METHOD "output of rpm")
-  elseif(PACMAN_EXECUTABLE)
-    EXEC_PROGRAM(${PACMAN_EXECUTABLE} "/"
-      ARGS "-Q" "gtest"
-      OUTPUT_VARIABLE GTEST_VERSION_STR)
-    set(GTEST_DETECTION_METHOD "output of pacman")
-  elseif(GTEST_CONFIG_EXECUTABLE)
-    EXEC_PROGRAM(${GTEST_CONFIG_EXECUTABLE} "/"
-      ARGS "--version"
-      OUTPUT_VARIABLE GTEST_VERSION_STR)
-    set(GTEST_DETECTION_METHOD "output of gtest-config")
-  else()
-    message(WARNING "Could not detect GTest version, Assuming v1.8.0 (or compatible) and hoping for the best")
-    set(GTEST_VERSION_STR "1.8.0")
-    add_compile_definitions(GTEST_VERSION_UNKNOWN)
-    set(GTEST_DETECTION_METHOD "best guess, could not detect")
-  endif()
-endif()
-
-string(REGEX MATCH
-  "([0-9])\\.([0-9]+)\\.([0-9])" GTEST_VERSION_PARSED
-  ${GTEST_VERSION_STR})
-if (GTEST_VERSION_PARSED)
-  set(GTEST_VERSION_MAJOR ${CMAKE_MATCH_1})
-  set(GTEST_VERSION_MINOR ${CMAKE_MATCH_2})
-  set(GTEST_VERSION_PATCH ${CMAKE_MATCH_3})
-  message("Using GTest v${GTEST_VERSION_MAJOR}.${GTEST_VERSION_MINOR}.${GTEST_VERSION_PATCH} (parsed from ${GTEST_DETECTION_METHOD})")
-else()
-  message(WARNING "Could not parse GTest version: ${GTEST_VERSION_STR} (${GTEST_DETECTION_METHOD}), Assuming v1.8.0 (or compatible) and hoping for the best")
-  set(GTEST_VERSION_MAJOR 1)
-  set(GTEST_VERSION_MINOR 8)
-  set(GTEST_VERSION_PATCH 0)
-  add_compile_definitions(GTEST_VERSION_UNKNOWN)
-endif()
-
-add_compile_definitions(GTEST_VERSION_MAJOR=${GTEST_VERSION_MAJOR})
-add_compile_definitions(GTEST_VERSION_MINOR=${GTEST_VERSION_MINOR})
-add_compile_definitions(GTEST_VERSION_PATCH=${GTEST_VERSION_PATCH})
-
 pkg_check_modules(UMOCKDEV REQUIRED IMPORTED_TARGET umockdev-1.0>=0.6)
 if (NOT UMOCKDEV_FOUND)
   message(FATAL_ERROR "Umockdev not found, cannot build without disabling tests (via MIR_ENABLE_TESTS).")

diff --git a/tests/include/check_gtest_version.h b/tests/include/check_gtest_version.h
diff --git a/tests/include/mir/test/input_config_matchers.h b/tests/include/mir/test/input_config_matchers.h
@@ -16,7 +16,6 @@
 #ifndef MIR_TEST_INPUT_CONFIG_MATCHERS_H
 #define MIR_TEST_INPUT_CONFIG_MATCHERS_H
 
-#include "check_gtest_version.h"
 #include "mir/input/mir_input_config.h"
 #include <gmock/gmock.h>
 
@@ -35,12 +34,8 @@ class InputConfigElementsMatcher
     // Constructs the matcher from a sequence of element values or
     // element matchers.
     template <typename InputIter>
-#if GTEST_AT_LEAST(1, 8, 1)
     InputConfigElementsMatcher(UnorderedMatcherRequire::Flags matcher_flags, InputIter first, InputIter last)
         : UnorderedElementsAreMatcherImplBase{matcher_flags}
-#else
-    InputConfigElementsMatcher(InputIter first, InputIter last)
-#endif
     {
         for (; first != last; ++first)
         {
@@ -76,11 +71,7 @@ class InputConfigElementsMatcher
             return false;
         }
 
-#if GTEST_AT_LEAST(1, 8, 1)
         bool matrix_matched = VerifyMatchMatrix(element_printouts, matrix, listener);
-#else
-        bool matrix_matched = VerifyAllElementsAndMatchersAreMatched(element_printouts, matrix, listener);
-#endif
 
         return matrix_matched && FindPairing(matrix, listener);
     }

diff --git a/tests/unit-tests/graphics/test_shm_buffer.cpp b/tests/unit-tests/graphics/test_shm_buffer.cpp
@@ -21,8 +21,6 @@
 #include "mir/test/doubles/mock_gl.h"
 #include "mir/test/doubles/mock_egl.h"
 
-#include "check_gtest_version.h"
-
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <GLES2/gl2ext.h>
@@ -276,7 +274,6 @@ std::string to_string(MirPixelFormat format)
 }
 }
 
-#if GTEST_AT_LEAST(1, 8, 0)
 INSTANTIATE_TEST_SUITE_P(
     ShmBuffer,
     UploadTest,
@@ -285,13 +282,6 @@ INSTANTIATE_TEST_SUITE_P(
     {
         return std::to_string(info.param.format);
     });
-#else
-// TODO: The version of gtest in 16.04 doesn't have the “print the test nicely” option.
-INSTANTIATE_TEST_SUITE_P(
-    ShmBuffer,
-    UploadTest,
-    ValuesIn(test_cases));
-#endif
 
 namespace
 {