Merge 8fff1f4 into b80c37c

srz-zumix · Nov 17, 2019 · f21d9db · f21d9db
2 parents b80c37c + 8fff1f4
commit f21d9db
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 19 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -10,15 +10,20 @@ trigger:
     - drone/*
 
 steps:
-- name: release-1.8.1
-  image: srzzumix/googletest:release-1.8.1
+- name: release-1.10.0
+  image: srzzumix/googletest:release-1.10.0
   environment:
-    GTEST_EXPECT_VERSION: 0x01080100
+    GTEST_EXPECT_VERSION: 0x01100000
   commands: &gtest-compatible-commands
     - "cd test"
     - "make showcxxversion"
-    - "make USE_GTEST=1             GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} test"
-    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} test"
+    - "make USE_GTEST=1             GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} test"
+    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} test"
+- name: release-1.8.1
+  image: srzzumix/googletest:release-1.8.1
+  environment:
+    GTEST_EXPECT_VERSION: 0x01080100
+  commands: *gtest-compatible-commands
 - name: release-1.8.0
   image: srzzumix/googletest:release-1.8.0
   environment:
@@ -97,25 +102,30 @@ steps:
 - name: latest
   image: srzzumix/googletest:latest
   environment:
-    GTEST_EXPECT_VERSION: 0x01080100
+    GTEST_EXPECT_VERSION: 0x01100000
   commands:
     - "cd test"
     - "make showcxxversion"
-    - "make USE_GTEST=1             GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
-    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
+    - "make USE_GTEST=1             GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
+    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
   when:
     branch:
       exclude:
         - master
-- name: release-1.8.1
-  image: srzzumix/googletest:release-1.8.1
+- name: release-1.10.0
+  image: srzzumix/googletest:release-1.10.0
   environment:
-    GTEST_EXPECT_VERSION: 0x01080100
+    GTEST_EXPECT_VERSION: 0x01100000
   commands: &gtest-version-detect-commands
     - "cd test"
     - "make showcxxversion"
-    - "make USE_GTEST=1             GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} gtest-version"
-    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} gtest-version"
+    - "make USE_GTEST=1             GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} gtest-version"
+    - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} gtest-version"
+- name: release-1.8.1
+  image: srzzumix/googletest:release-1.8.1
+  environment:
+    GTEST_EXPECT_VERSION: 0x01080100
+  commands: *gtest-version-detect-commands
 - name: release-1.8.0
   image: srzzumix/googletest:release-1.8.0
   environment:

diff --git a/include/gtest/iutest_gmock_ver.hpp b/include/gtest/iutest_gmock_ver.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2014-2018, Takazumi Shirayanagi\n
+ * Copyright (C) 2014-2019, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -26,9 +26,11 @@
 
 //!< Minor Version
 #ifndef GMOCK_MINORVER
-#  if   !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
-#    define GMOCK_MINORVER  0x08
+#  if   defined(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT)
+#    define GMOCK_MINORVER  0x10
 #    define GMOCK_LATEST    1
+#  elif defined(GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_)
+#    define GMOCK_MINORVER  0x10
 #  elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_)
 #    define GMOCK_MINORVER  0x08
 #  elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_)

diff --git a/include/gtest/iutest_gtest_ver.hpp b/include/gtest/iutest_gtest_ver.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2012-2018, Takazumi Shirayanagi\n
+ * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -27,9 +27,11 @@
 
 //!< Minor Version
 #ifndef GTEST_MINORVER
-#  if   !defined(GTEST_INCLUDE_GTEST_INTERNAL_GTEST_LINKED_PTR_H_)
-#    define GTEST_MINORVER  0x08
+#  if   defined(GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
+#    define GTEST_MINORVER  0x10
 #    define GTEST_LATEST    1
+#  elif defined(GTEST_SKIP)
+#    define GTEST_MINORVER  0x10
 #  elif defined(GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_)
 #    define GTEST_MINORVER  0x08
 #  elif !defined(RUN_ALL_TESTS) && !defined(GTEST_CREF_WORKAROUND_)