fix gtest 1.12 or later compat (#684)

srz-zumix · Dec 13, 2022 · 56d7589 · 56d7589
1 parent 30548c1
commit 56d7589
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/include/gtest/iutest_gmock_ver.hpp b/include/gtest/iutest_gmock_ver.hpp
@@ -54,7 +54,9 @@
 
 //!< Micro Version
 #ifndef GMOCK_MICROVER
-#  if   GMOCK_MINORVER == 0x08 && !defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
+#  if   GMOCK_MINORVER == 0x12 && defined(GOOGLEMOCK_INCLUDE_GMOCK_GMOCK_FUNCTION_MOCKER_H_)
+#    define GMOCK_MICROVER  0x01
+#  elif GMOCK_MINORVER == 0x08 && !defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)
 #    define GMOCK_MICROVER  0x01
 #  endif
 #endif

diff --git a/include/gtest/iutest_gtest_ver.hpp b/include/gtest/iutest_gtest_ver.hpp
@@ -59,7 +59,9 @@
 
 //!< Micro Version
 #ifndef GTEST_MICROVER
-#  if   GTEST_MINORVER == 0x08 && defined(GTEST_STRINGIFY_)
+#  if   GTEST_MINORVER == 0x12 && defined(GTEST_HAVE_ATTRIBUTE_)
+#    define GTEST_MICROVER    0x01
+#  elif GTEST_MINORVER == 0x08 && defined(GTEST_STRINGIFY_)
 #    define GTEST_MICROVER    0x01
 #  elif GTEST_MINORVER == 0x02 && defined(GTEST_HAS_CLONE)
 #    define GTEST_MICROVER  0x01

diff --git a/test/random_seed_tests.cpp b/test/random_seed_tests.cpp
@@ -72,15 +72,14 @@ int main(int argc, char* argv[])
 {
     MyEnvironment* const env = new MyEnvironment();
     IUTEST_TERMINATE_ON_FAILURE( ::iutest::AddGlobalTestEnvironment(env) == env );
-    IUTEST_INIT(&argc, argv);
-
+#if defined(IUTEST_USE_GTEST) && (GTEST_VER >= 0x01120000)
+    ::iutest::IUTEST_FLAG(recreate_environments_when_repeating) = true;
+#endif
     ::iutest::IUTEST_FLAG(repeat) = kRepeatCount;
     ::iutest::IUTEST_FLAG(shuffle) = true;
     ::iutest::IUTEST_FLAG(random_seed) = kSeed;
 
-#if defined(IUTEST_USE_GTEST) && GTEST_LATEST
-    ::iutest::IUTEST_FLAG(recreate_environments_when_repeating) = true;
-#endif
+    IUTEST_INIT(&argc, argv);
 
     const int ret = IUTEST_RUN_ALL_TESTS();
     if( ret != 0 ) return ret;

diff --git a/test/repeat_tests.cpp b/test/repeat_tests.cpp
@@ -145,7 +145,7 @@ int main(int argc, char* argv[])
     IUTEST_TERMINATE_ON_FAILURE( ::iutest::AddGlobalTestEnvironment(env) == env );
     IUTEST_INIT(&argc, argv);
 
-#if defined(IUTEST_USE_GTEST) && GTEST_LATEST
+#if defined(IUTEST_USE_GTEST) && (GTEST_VER >= 0x01120000)
     ::iutest::IUTEST_FLAG(recreate_environments_when_repeating) = true;
 #endif
 

diff --git a/test/shuffle_tests.cpp b/test/shuffle_tests.cpp
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
     ::iutest::IUTEST_FLAG(repeat) = 3;
     ::iutest::IUTEST_FLAG(shuffle) = true;
 
-#if defined(IUTEST_USE_GTEST) && GTEST_LATEST
+#if defined(IUTEST_USE_GTEST) && (GTEST_VER >= 0x01120000)
     ::iutest::IUTEST_FLAG(recreate_environments_when_repeating) = true;
 #endif