gmock: update from 1.8.0 to 1.11.0

test/CMakeLists.txt

@@ -25,7 +25,7 @@ ELSE ()
 ENDIF ()
 
 # Google Test and Mock
-set(GMOCK_DIR gmock-1.8.0)
+set(GMOCK_DIR gmock-1.11.0)
 add_library(gmock STATIC
   ${GMOCK_DIR}/gmock-gtest-all.cc
   ${GMOCK_DIR}/gmock/gmock.h

test/Makefile.am

@@ -10,7 +10,7 @@ CPPFLAGS += -I$(ARES_BLD_DIR)/include \
             -I$(ARES_SRC_DIR)/include \
             -I$(ARES_SRC_DIR)/src/lib \
             -I$(top_builddir)         \
-            -isystem $(srcdir)/gmock-1.8.0
+            -isystem $(srcdir)/gmock-1.11.0
 CXXFLAGS += -Wall $(PTHREAD_CFLAGS)
 
 # Makefile.inc provides the various *SOURCES and *HEADERS defines
@@ -21,11 +21,11 @@ TESTS = arestest fuzzcheck.sh
 noinst_LTLIBRARIES = libgmock.la
 
 libgmock_la_SOURCES = \
-  gmock-1.8.0/gmock-gtest-all.cc	\
-  gmock-1.8.0/gmock/gmock.h		\
-  gmock-1.8.0/gtest/gtest.h
+  gmock-1.11.0/gmock-gtest-all.cc	\
+  gmock-1.11.0/gmock/gmock.h		\
+  gmock-1.11.0/gtest/gtest.h
 
-libgmock_la_CPPFLAGS = -isystem $(srcdir)/gmock-1.8.0
+libgmock_la_CPPFLAGS = -isystem $(srcdir)/gmock-1.11.0
 
 
 noinst_PROGRAMS = arestest aresfuzz aresfuzzname dnsdump

test/Makefile.m32

@@ -13,7 +13,7 @@ ARES_SRC_DIR = ..
 # Where to find the built c-ares static library
 ARES_BLD_DIR = ..
 ARESLIB = $(ARES_BLD_DIR)/src/lib/libcares.a
-GMOCK_DIR = gmock-1.8.0
+GMOCK_DIR = gmock-1.11.0
 CPPFLAGS = -I$(ARES_SRC_DIR)/include -I$(ARES_SRC_DIR)/src/lib -I$(GMOCK_DIR) -DCARES_STATICLIB
 CXXFLAGS = -Wall $(PTHREAD_CFLAGS) -std=gnu++11
 LDFLAGS =

test/Makefile.msvc

@@ -124,7 +124,7 @@ VALID_CFGSET = TRUE
 PROG_DIR = $(BASE_DIR)\arestest
 LIB_DIR = $(LIB_BASE_DIR)\cares
 
-GMOCK_DIR = gmock-1.8.0
+GMOCK_DIR = gmock-1.11.0
 
 # ---------------------------------------------------
 # Subdirs which are configuration dependent are only

test/gmock-1.11.0/README.md

@@ -0,0 +1,9 @@
+Creating Combined gmock release
+===============================
+```
+wget https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz && \
+tar -zxvpf release-1.11.0.tar.gz && \
+python3 ./googletest-release-1.11.0/googlemock/scripts/fuse_gmock_files.py ./googletest-release-1.11.0/googlemock gmock-1.11.0 && \
+rm -rf googletest-release-1.11.0 release-1.11.0.tar.gz
+```
+