gtest 1.11.0 released

.ci/teamcity/gmock-compat.dsl

@@ -0,0 +1,137 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.dockerSupport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object GoogleMockCompatibleTest : BuildType({
+    name = "GoogleMock Compatible Test"
+
+    artifactRules = "test/**/*.xml"
+    publishArtifacts = PublishMode.ALWAYS
+
+    params {
+        param("env.MAKE_OPTION", "-j4 USE_GTEST=1 USE_GMOCK=1")
+    }
+
+    vcs {
+        root(HttpsGithubComSrzZumixIutestRefsHeadsMaster)
+    }
+    steps {
+        script {
+            name = "gtest-compat-1.5.0"
+            scriptContent = """
+                cd test && mkdir gtest1_5_0
+                make clean
+                make OUTDIR=gtest1_5_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01050000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.5.0"
+        }
+        script {
+            name = "gtest-compat-1.6.0"
+            scriptContent = """
+                cd test && mkdir gmock1_6_0
+                make clean
+                make OUTDIR=gmock1_6_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01060000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.6.0"
+        }
+        script {
+            name = "gtest-compat-1.7.0"
+            scriptContent = """
+                cd test && mkdir gmock1_7_0
+                make clean
+                make OUTDIR=gmock1_7_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01070000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.7.0"
+        }
+        script {
+            name = "gtest-compat-1.8.0"
+            scriptContent = """
+                cd test && mkdir gmock1_8_0
+                make clean
+                make OUTDIR=gmock1_8_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01080000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.8.0"
+        }
+        script {
+            name = "gtest-compat-1.8.1"
+            scriptContent = """
+                cd test && mkdir gmock1_8_1
+                make clean
+                make OUTDIR=gmock1_8_1 OUTPUTXML=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.8.1"
+        }
+        script {
+            name = "gtest-compat-1.10.0"
+            scriptContent = """
+                cd test && mkdir gmock1_10_0
+                make clean
+                make OUTDIR=gmock1_10_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01100000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.10.0"
+        }
+        script {
+            name = "gtest-compat-1.11.0"
+            scriptContent = """
+                cd test && mkdir gmock1_11_0
+                make clean
+                make OUTDIR=gmock1_11_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01110000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.11.0"
+        }
+    }
+    triggers {
+        vcs {
+            branchFilter = """
+                +:master
+                +:develop
+            """.trimIndent()
+        }
+    }
+
+    features {
+        pullRequests {
+            vcsRootExtId = "${HttpsGithubComSrzZumixIutestRefsHeadsMaster.id}"
+            provider = github {
+                authType = token {
+                    token = "******"
+                }
+                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+            }
+        }
+        commitStatusPublisher {
+            vcsRootExtId = "${HttpsGithubComSrzZumixIutestRefsHeadsMaster.id}"
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "******"
+                }
+            }
+        }
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_2"
+            }
+        }
+        xmlReport {
+            reportType = XmlReport.XmlReportType.GOOGLE_TEST
+            rules = "test/*.xml"
+        }
+    }
+})

.ci/teamcity/gtest-compat.dsl

@@ -0,0 +1,141 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.XmlReport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.dockerSupport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.xmlReport
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object GoogleTestCompatibleTest : BuildType({
+    name = "GoogleTest Compatible Test"
+
+    artifactRules = "test/**/*.xml"
+    publishArtifacts = PublishMode.ALWAYS
+
+    params {
+        param("env.MAKE_OPTION", "-j4 USE_GTEST=1")
+    }
+
+    vcs {
+        root(HttpsGithubComSrzZumixIutestRefsHeadsMaster)
+    }
+    steps {
+        script {
+            name = "gtest-compat-1.5.0"
+            scriptContent = """
+                cd test && mkdir gtest1_5_0
+                make clean
+                make OUTDIR=gtest1_5_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01050000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.5.0"
+        }
+        script {
+            name = "gtest-compat-1.6.0"
+            scriptContent = """
+                cd test && mkdir gtest1_6_0
+                make clean
+                make OUTDIR=gtest1_6_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01060000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.6.0"
+        }
+        script {
+            name = "gtest-compat-1.7.0"
+            scriptContent = """
+                cd test && mkdir gtest1_7_0
+                make clean
+                make OUTDIR=gtest1_7_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01070000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.7.0"
+        }
+        script {
+            name = "gtest-compat-1.8.0"
+            scriptContent = """
+                cd test && mkdir gtest1_8_0
+                make clean
+                make OUTDIR=gtest1_8_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01080000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.8.0"
+        }
+        script {
+            name = "gtest-compat-1.8.1"
+            scriptContent = """
+                cd test && mkdir gtest1_8_1
+                make clean
+                make OUTDIR=gtest1_8_1 OUTPUTXML=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.8.1"
+        }
+        script {
+            name = "gtest-compat-1.10.0"
+            scriptContent = """
+                cd test && mkdir gtest1_10_0
+                make clean
+                make OUTDIR=gtest1_10_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01100000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.10.0"
+        }
+        script {
+            name = "gtest-compat-1.11.0"
+            scriptContent = """
+                cd test && mkdir gtest1_11_0
+                make clean
+                make OUTDIR=gtest1_11_0 OUTPUTXML=1 GTEST_EXPECT_VER=0x01110000 GTEST_EXPECT_LATEST= %env.MAKE_OPTION% test
+            """.trimIndent()
+            dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
+            dockerImage = "srzzumix/googletest:release-1.11.0"
+        }
+    }
+    triggers {
+        vcs {
+            branchFilter = """
+                +:master
+                +:develop
+            """.trimIndent()
+        }
+    }
+
+    features {
+        pullRequests {
+            vcsRootExtId = "${HttpsGithubComSrzZumixIutestRefsHeadsMaster.id}"
+            provider = github {
+                authType = token {
+                    token = "******"
+                }
+                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+            }
+        }
+        commitStatusPublisher {
+            vcsRootExtId = "${HttpsGithubComSrzZumixIutestRefsHeadsMaster.id}"
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "******"
+                }
+            }
+        }
+        dockerSupport {
+            loginToRegistry = on {
+                dockerRegistryId = "PROJECT_EXT_2"
+            }
+        }
+        xmlReport {
+            reportType = XmlReport.XmlReportType.GOOGLE_TEST
+            rules = "test/**/*.xml"
+        }
+    }
+
+    requirements {
+        matches("teamcity.agent.jvm.os.family", "Linux")
+    }
+})

.drone.yml

@@ -454,8 +454,8 @@ steps:
 #     branch:
 #       exclude:
 #         - master
-# - name: release-1.10.0
-#   image: srzzumix/googletest:release-1.10.0
+# - name: release-1.11.0
+#   image: srzzumix/googletest:release-1.11.0
 #   environment:
 #     GTEST_EXPECT_VERSION: 0x01100000
 #   commands: &gtest-compatible-commands
@@ -470,6 +470,12 @@ steps:
 #       make -j4 USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} &&
 #       make test
 #   depends_on: [ clone ]
+# - name: release-1.10.0
+#   image: srzzumix/googletest:release-1.10.0
+#   environment:
+#     GTEST_EXPECT_VERSION: 0x01080100
+#   commands: *gtest-compatible-commands
+#   depends_on: [ clone ]
 # - name: release-1.8.1
 #   image: srzzumix/googletest:release-1.8.1
 #   environment:
@@ -550,6 +556,7 @@ steps:
 #     status: [ failure ]
 #   depends_on:
 #     - latest
+#     - release-1.11.0
 #     - release-1.10.0
 #     - release-1.8.1
 #     - release-1.8.0
@@ -595,8 +602,8 @@ steps:
 #       exclude:
 #         - master
 #   depends_on: [ clone ]
-# - name: release-1.10.0
-#   image: srzzumix/googletest:release-1.10.0
+# - name: release-1.11.0
+#   image: srzzumix/googletest:release-1.11.0
 #   environment:
 #     GTEST_EXPECT_VERSION: 0x01100000
 #   commands: &gtest-version-detect-commands
@@ -609,6 +616,12 @@ steps:
 #       make clean &&
 #       make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} gtest-version
 #   depends_on: [ clone ]
+# - name: release-1.10.0
+#   image: srzzumix/googletest:release-1.8.1
+#   environment:
+#     GTEST_EXPECT_VERSION: 0x01080100
+#   commands: *gtest-version-detect-commands
+#   depends_on: [ clone ]
 # - name: release-1.8.1
 #   image: srzzumix/googletest:release-1.8.1
 #   environment:
@@ -688,6 +701,7 @@ steps:
 #     status: [ failure ]
 #   depends_on:
 #     - latest
+#     - release-1.11.0
 #     - release-1.10.0
 #     - release-1.8.1
 #     - release-1.8.0

include/gtest/iutest_gmock_ver.hpp

@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2014-2019, Takazumi Shirayanagi\n
+ * Copyright (C) 2014-2021, 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(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT)
-#    define GMOCK_MINORVER  0x10
+#  if   defined(GTEST_FLAG_GET)
+#    define GMOCK_MINORVER  0x11
 #    define GMOCK_LATEST    1
+#  elif defined(GMOCK_INTERNAL_NOEXCEPT_SPEC_IF_NOEXCEPT)
+#    define GMOCK_MINORVER  0x11
 #  elif defined(GMOCK_INCLUDE_GMOCK_GMOCK_NICE_STRICT_H_)
 #    define GMOCK_MINORVER  0x10
 #  elif defined(GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_)

include/gtest/iutest_gtest_ver.hpp

@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2012-2019, Takazumi Shirayanagi\n
+ * Copyright (C) 2012-2021, 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_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
-#    define GTEST_MINORVER  0x10
+#  if   defined(GTEST_FLAG_GET)
+#    define GTEST_MINORVER  0x11
 #    define GTEST_LATEST    1
+#  elif defined(GTEST_TEST_NO_THROW_CATCH_STD_EXCEPTION_)
+#    define GTEST_MINORVER  0x11
 #  elif defined(GTEST_SKIP)
 #    define GTEST_MINORVER  0x10
 #  elif defined(GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_)