You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/17 17:48:36 UTC
[4/6] mesos git commit: Updated GMock/GTest in stout.
Updated GMock/GTest in stout.
This will fix various issues that occured with version 1.7.0.
As GTest is now using 'std::tuple' instead of 'std::tr1::tuple', some
test cases have been updated accordingly.
Review: https://reviews.apache.org/r/58350/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e6cdf2a6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e6cdf2a6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e6cdf2a6
Branch: refs/heads/master
Commit: e6cdf2a6090310de017c5004865bd69fa9e4050a
Parents: 9545564
Author: Jan Schlicht <ja...@mesosphere.io>
Authored: Wed May 17 10:21:56 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Wed May 17 10:48:00 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/3rdparty/Makefile.am | 7 +++---
3rdparty/stout/Makefile.am | 5 +++--
3rdparty/stout/cmake/StoutTestsConfigure.cmake | 24 +++++++--------------
3rdparty/stout/configure.ac | 3 ---
4 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6cdf2a6/3rdparty/stout/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/3rdparty/Makefile.am b/3rdparty/stout/3rdparty/Makefile.am
index 73f6e05..88a4b02 100644
--- a/3rdparty/stout/3rdparty/Makefile.am
+++ b/3rdparty/stout/3rdparty/Makefile.am
@@ -31,15 +31,16 @@ include ../../versions.am
BOOST = boost-$(BOOST_VERSION)
GLOG = glog-$(GLOG_VERSION)
-GMOCK = gmock-$(GMOCK_VERSION)
-GTEST = $(GMOCK)/gtest
+GOOGLETEST = googletest-release-$(GOOGLETEST_VERSION)
+GMOCK = $(GOOGLETEST)/googlemock
+GTEST = $(GOOGLETEST)/googletest
PROTOBUF = protobuf-$(PROTOBUF_VERSION)
PICOJSON = picojson-$(PICOJSON_VERSION)
EXTRA_DIST = \
$(BOOST).tar.gz \
$(GLOG).tar.gz \
- $(GMOCK).tar.gz \
+ $(GOOGLETEST).tar.gz \
$(PROTOBUF).tar.gz \
$(PICOJSON).tar.gz
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6cdf2a6/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index ebf1069..8a1aef3 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -50,8 +50,9 @@ include ../versions.am
BOOST = $(BUNDLED_DIR)/boost-$(BOOST_VERSION)
ELFIO = $(BUNDLED_DIR)/elfio-$(ELFIO_VERSION)
GLOG = $(BUNDLED_DIR)/glog-$(GLOG_VERSION)
-GMOCK = $(BUNDLED_DIR)/gmock-$(GMOCK_VERSION)
-GTEST = $(GMOCK)/gtest
+GOOGLETEST = $(BUNDLED_DIR)/googletest-release-$(GOOGLETEST_VERSION)
+GMOCK = $(GOOGLETEST)/googlemock
+GTEST = $(GOOGLETEST)/googletest
PROTOBUF = $(BUNDLED_DIR)/protobuf-$(PROTOBUF_VERSION)
PICOJSON = $(BUNDLED_DIR)/picojson-$(PICOJSON_VERSION)
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6cdf2a6/3rdparty/stout/cmake/StoutTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/StoutTestsConfigure.cmake b/3rdparty/stout/cmake/StoutTestsConfigure.cmake
index 685f1c8..1bd3d3d 100644
--- a/3rdparty/stout/cmake/StoutTestsConfigure.cmake
+++ b/3rdparty/stout/cmake/StoutTestsConfigure.cmake
@@ -37,26 +37,19 @@ set(
# COMPILER CONFIGURATION.
#########################
-EXTERNAL("gmock" ${GMOCK_VERSION} "${MESOS_3RDPARTY_BIN}")
-
-if (APPLE)
- # GTEST on OSX needs its own tr1 tuple.
- add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11)
-endif (APPLE)
-
-set(GTEST_SRC ${GMOCK_ROOT}/gtest)
+EXTERNAL("googletest" ${GOOGLETEST_VERSION} "${MESOS_3RDPARTY_BIN}")
# Convenience variables for include directories of third-party dependencies.
-set(GMOCK_INCLUDE_DIR ${GMOCK_ROOT}/include)
-set(GTEST_INCLUDE_DIR ${GTEST_SRC}/include)
+set(GMOCK_INCLUDE_DIR ${GOOGLETEST_ROOT}/googlemock/include)
+set(GTEST_INCLUDE_DIR ${GOOGLETEST_ROOT}/googletest/include)
# Convenience variables for `lib` directories of built third-party dependencies.
if (WIN32)
- set(GMOCK_LIB_DIR ${GMOCK_ROOT}-build/${CMAKE_BUILD_TYPE})
- set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/${CMAKE_BUILD_TYPE})
+ set(GMOCK_LIB_DIR ${GOOGLETEST_ROOT}-build/googlemock/${CMAKE_BUILD_TYPE})
+ set(GTEST_LIB_DIR ${GOOGLETEST_ROOT}-build/googlemock/gtest/${CMAKE_BUILD_TYPE})
else (WIN32)
- set(GMOCK_LIB_DIR ${GMOCK_ROOT}-lib/lib/)
- set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/lib/.libs)
+ set(GMOCK_LIB_DIR ${GOOGLETEST_ROOT}-lib/lib)
+ set(GTEST_LIB_DIR ${GOOGLETEST_ROOT}-lib/lib/gtest)
endif (WIN32)
# Convenience variables for "lflags", the symbols we pass to CMake to generate
@@ -70,8 +63,7 @@ set(GTEST_LFLAG gtest)
set(STOUT_TEST_DEPENDENCIES
${STOUT_TEST_DEPENDENCIES}
${STOUT_DEPENDENCIES}
- ${GMOCK_TARGET}
- ${GTEST_TARGET}
+ ${GOOGLETEST_TARGET}
)
# DEFINE THIRD-PARTY INCLUDE DIRECTORIES. Tells compiler toolchain where to get
http://git-wip-us.apache.org/repos/asf/mesos/blob/e6cdf2a6/3rdparty/stout/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/stout/configure.ac b/3rdparty/stout/configure.ac
index 50c1f6f..abb6521 100644
--- a/3rdparty/stout/configure.ac
+++ b/3rdparty/stout/configure.ac
@@ -690,9 +690,6 @@ case "$host_os" in
if test "x$ax_cv_cxx_compiler_vendor" = "xclang"; then
CXXFLAGS="$CXXFLAGS -stdlib=libc++"
fi
-
- # GTEST on OSX needs its own tr1 tuple.
- CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11"
;;
freebsd* )
# If we're using clang, we need to pass -stdlib=libc++ too.