[thirdparty] update googletest up to 1.12.1 version

Along with other fixes and updates, googletest v1.12.1 includes the fix
that allows for building the library with CLANG 13 and newer [1].

[1] google/googletest#3427

Change-Id: Ic1a398cbb93a6edb918e84e05927feb4b067058c
Reviewed-on: http://gerrit.cloudera.org:8080/18922
Reviewed-by: Attila Bukor <[email protected]>
Tested-by: Alexey Serbin <[email protected]>

build-support/iwyu/mappings/gmock.imp

@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+[
+  { include: [ "<gmock/gmock-actions.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-cardinalities.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-function-mocker.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-matchers.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-more-actions.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-more-matchers.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-nice-strict.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/gmock-spec-builders.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/internal/custom/gmock-generated-actions.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/internal/custom/gmock-matchers.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/internal/custom/gmock-port.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/internal/gmock-internal-utils.h>", private, "<gmock/gmock.h>", public ] },
+  { include: [ "<gmock/internal/gmock-port.h>", private, "<gmock/gmock.h>", public ] }
+]

build-support/iwyu/mappings/gtest.imp

@@ -15,12 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 [
-  { include: [ "<gtest/internal/gtest-internal.h>", private, "<gtest/gtest.h>", public ] },
-  { include: [ "<gtest/internal/gtest-string.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/gtest-assertion-result.h>", private, "<gtest/gtest.h>", public ] },
   { include: [ "<gtest/gtest-death-test.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/gtest-matchers.h>", private, "<gtest/gtest.h>", public ] },
   { include: [ "<gtest/gtest-message.h>", private, "<gtest/gtest.h>", public ] },
   { include: [ "<gtest/gtest-param-test.h>", private, "<gtest/gtest.h>", public ] },
   { include: [ "<gtest/gtest-printers.h>", private, "<gtest/gtest.h>", public ] },
   { include: [ "<gtest/gtest-test-part.h>", private, "<gtest/gtest.h>", public ] },
-  { include: [ "<gtest/gtest-typed-test.h>", private, "<gtest/gtest.h>", public ] }
+  { include: [ "<gtest/gtest-typed-test.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/gtest_pred_impl.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-death-test-internal.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-filepath.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-internal.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-param-util.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-port.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-string.h>", private, "<gtest/gtest.h>", public ] },
+  { include: [ "<gtest/internal/gtest-type-util.h>", private, "<gtest/gtest.h>", public ] }
 ]

src/kudu/client/client-test.cc

@@ -41,7 +41,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <glog/stl_logging.h>
-#include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
 #include <google/protobuf/util/message_differencer.h>
 #include <gtest/gtest.h>
 

src/kudu/codegen/codegen-test.cc

@@ -26,7 +26,7 @@
 #include <gflags/gflags_declare.h>
 #include <glog/logging.h>
 #include <glog/stl_logging.h> // IWYU pragma: keep
-#include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "kudu/codegen/code_generator.h"

src/kudu/tools/kudu-tool-test.cc

@@ -39,7 +39,7 @@
 #include <gflags/gflags_declare.h>
 #include <glog/logging.h>
 #include <glog/stl_logging.h>
-#include <gmock/gmock-matchers.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "kudu/cfile/cfile-test-base.h"

src/kudu/util/logging-test.cc

@@ -28,8 +28,7 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest-matchers.h>
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include "kudu/gutil/strings/substitute.h"

thirdparty/build-definitions.sh

@@ -511,9 +511,17 @@ build_gmock_gtest() {
   # Install gmock/gtest libraries and headers manually instead of using make
   # install. Make install results in libraries with a malformed lib name on
   # macOS.
+  if [ -n "$OS_LINUX" ]; then
+    local ver_suffix=${DYLIB_SUFFIX}.${GMOCK_VERSION}
+  else
+    # on macOS the naming of versioned libraries differ from what it's on Linux
+    local ver_suffix=${GMOCK_VERSION}.${DYLIB_SUFFIX}
+  fi
   echo Installing gmock and gtest...
+  cp -a $GMOCK_SHARED_BDIR/lib/libgmock.$ver_suffix $PREFIX/lib/
   cp -a $GMOCK_SHARED_BDIR/lib/libgmock.$DYLIB_SUFFIX $PREFIX/lib/
   cp -a $GMOCK_STATIC_BDIR/lib/libgmock.a $PREFIX/lib/
+  cp -a $GMOCK_SHARED_BDIR/lib/libgtest.$ver_suffix $PREFIX/lib/
   cp -a $GMOCK_SHARED_BDIR/lib/libgtest.$DYLIB_SUFFIX $PREFIX/lib/
   cp -a $GMOCK_STATIC_BDIR/lib/libgtest.a $PREFIX/lib/
   rsync -av $GMOCK_SOURCE/googlemock/include/ $PREFIX/include/

thirdparty/download-thirdparty.sh

@@ -183,7 +183,7 @@ fetch_and_patch \
  googletest-release-${GMOCK_VERSION}.tar.gz \
  $GMOCK_SOURCE \
  $GMOCK_PATCHLEVEL \
- "patch -p1 < $TP_DIR/patches/gmock-remove-unused-gunit-iwyu-pragma.patch"
+ "patch -p0 < $TP_DIR/patches/gmock-update-iwyu-pragma.patch"
 
 GFLAGS_PATCHLEVEL=0
 fetch_and_patch \