From 2869b107c7bbbd578e3832a6486657b878745b1c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 3 Sep 2016 14:37:54 +0200 Subject: [PATCH] Update GoogleTest (nw) --- 3rdparty/googletest/README.md | 1 + 3rdparty/googletest/appveyor.yml | 71 ++++++++++++ 3rdparty/googletest/googlemock/make/Makefile | 2 +- .../googlemock/msvc/2005/gmock_config.vsprops | 2 +- .../googlemock/msvc/2010/gmock_config.props | 2 +- .../googletest/googlemock/msvc/2015/gmock.sln | 32 ++++++ .../googlemock/msvc/2015/gmock.vcxproj | 84 ++++++++++++++ .../googlemock/msvc/2015/gmock_config.props | 19 ++++ .../googlemock/msvc/2015/gmock_main.vcxproj | 90 +++++++++++++++ .../googlemock/msvc/2015/gmock_test.vcxproj | 103 ++++++++++++++++++ .../googlemock/test/gmock-matchers_test.cc | 8 +- .../googletest/cmake/internal_utils.cmake | 20 +++- .../googletest/include/gtest/gtest.h | 4 +- .../include/gtest/internal/gtest-port.h | 12 +- .../googletest/test/gtest-port_test.cc | 7 ++ .../test/gtest_list_tests_unittest.py | 4 +- .../googletest/test/gtest_unittest.cc | 2 +- 3rdparty/googletest/travis.sh | 2 +- 18 files changed, 448 insertions(+), 17 deletions(-) create mode 100644 3rdparty/googletest/appveyor.yml create mode 100644 3rdparty/googletest/googlemock/msvc/2015/gmock.sln create mode 100644 3rdparty/googletest/googlemock/msvc/2015/gmock.vcxproj create mode 100644 3rdparty/googletest/googlemock/msvc/2015/gmock_config.props create mode 100644 3rdparty/googletest/googlemock/msvc/2015/gmock_main.vcxproj create mode 100644 3rdparty/googletest/googlemock/msvc/2015/gmock_test.vcxproj diff --git a/3rdparty/googletest/README.md b/3rdparty/googletest/README.md index f4b8965a9fd..076484e4fad 100644 --- a/3rdparty/googletest/README.md +++ b/3rdparty/googletest/README.md @@ -2,6 +2,7 @@ # Google Test # [![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest) +[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/BillyDonahue/googletest/branch/master) Welcome to **Google Test**, Google's C++ test framework! diff --git a/3rdparty/googletest/appveyor.yml b/3rdparty/googletest/appveyor.yml new file mode 100644 index 00000000000..d613fd60278 --- /dev/null +++ b/3rdparty/googletest/appveyor.yml @@ -0,0 +1,71 @@ +version: '{build}' + +os: Visual Studio 2015 + +environment: + matrix: + - Toolset: v140 + - Toolset: v120 + - Toolset: v110 + - Toolset: v100 + +platform: + - Win32 + - x64 + +configuration: +# - Release + - Debug + +build: + verbosity: minimal + +artifacts: + - path: '_build/Testing/Temporary/*' + name: test_results + +before_build: +- ps: | + Write-Output "Configuration: $env:CONFIGURATION" + Write-Output "Platform: $env:PLATFORM" + $generator = switch ($env:TOOLSET) + { + "v140" {"Visual Studio 14 2015"} + "v120" {"Visual Studio 12 2013"} + "v110" {"Visual Studio 11 2012"} + "v100" {"Visual Studio 10 2010"} + } + if ($env:PLATFORM -eq "x64") + { + $generator = "$generator Win64" + } + +build_script: +- ps: | + if (($env:TOOLSET -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + } + md _build -Force | Out-Null + cd _build + + & cmake -G "$generator" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -Dgtest_build_tests=ON -Dgtest_build_samples=ON -Dgmock_build_tests=ON .. + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } + & cmake --build . --config $env:CONFIGURATION + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } + +test_script: +- ps: | + if (($env:Toolset -eq "v100") -and ($env:PLATFORM -eq "x64")) + { + return + } + + & ctest -C $env:CONFIGURATION --output-on-failure + if ($LastExitCode -ne 0) { + throw "Exec: $ErrorMessage" + } diff --git a/3rdparty/googletest/googlemock/make/Makefile b/3rdparty/googletest/googlemock/make/Makefile index c1cc0e90f17..7c13e05fa96 100644 --- a/3rdparty/googletest/googlemock/make/Makefile +++ b/3rdparty/googletest/googlemock/make/Makefile @@ -17,7 +17,7 @@ # Points to the root of Google Test, relative to where this file is. # Remember to tweak this if you move this file, or if you want to use # a copy of Google Test at a different location. -GTEST_DIR = ../gtest +GTEST_DIR = ../../googletest # Points to the root of Google Mock, relative to where this file is. # Remember to tweak this if you move this file. diff --git a/3rdparty/googletest/googlemock/msvc/2005/gmock_config.vsprops b/3rdparty/googletest/googlemock/msvc/2005/gmock_config.vsprops index 385ad07a193..9b5ff7f38ab 100644 --- a/3rdparty/googletest/googlemock/msvc/2005/gmock_config.vsprops +++ b/3rdparty/googletest/googlemock/msvc/2005/gmock_config.vsprops @@ -10,6 +10,6 @@ /> diff --git a/3rdparty/googletest/googlemock/msvc/2010/gmock_config.props b/3rdparty/googletest/googlemock/msvc/2010/gmock_config.props index 44e016d86eb..77bc95b192d 100644 --- a/3rdparty/googletest/googlemock/msvc/2010/gmock_config.props +++ b/3rdparty/googletest/googlemock/msvc/2010/gmock_config.props @@ -1,7 +1,7 @@ - ../../gtest + ../../../googletest <_ProjectFileVersion>10.0.30319.1 diff --git a/3rdparty/googletest/googlemock/msvc/2015/gmock.sln b/3rdparty/googletest/googlemock/msvc/2015/gmock.sln new file mode 100644 index 00000000000..c59e07fcb79 --- /dev/null +++ b/3rdparty/googletest/googlemock/msvc/2015/gmock.sln @@ -0,0 +1,32 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "gmock.vcxproj", "{34681F0D-CE45-415D-B5F2-5C662DFE3BD5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_test", "gmock_test.vcxproj", "{F10D22F8-AC7B-4213-8720-608E7D878CD2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock_main", "gmock_main.vcxproj", "{E4EF614B-30DF-4954-8C53-580A0BF6B589}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.ActiveCfg = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Debug|Win32.Build.0 = Debug|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.ActiveCfg = Release|Win32 + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5}.Release|Win32.Build.0 = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.ActiveCfg = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Debug|Win32.Build.0 = Debug|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.ActiveCfg = Release|Win32 + {F10D22F8-AC7B-4213-8720-608E7D878CD2}.Release|Win32.Build.0 = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.ActiveCfg = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Debug|Win32.Build.0 = Debug|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.ActiveCfg = Release|Win32 + {E4EF614B-30DF-4954-8C53-580A0BF6B589}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/3rdparty/googletest/googlemock/msvc/2015/gmock.vcxproj b/3rdparty/googletest/googlemock/msvc/2015/gmock.vcxproj new file mode 100644 index 00000000000..d5ddd09100d --- /dev/null +++ b/3rdparty/googletest/googlemock/msvc/2015/gmock.vcxproj @@ -0,0 +1,84 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {34681F0D-CE45-415D-B5F2-5C662DFE3BD5} + gmock + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + + $(GTestDir);%(AdditionalIncludeDirectories) + $(GTestDir);%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/3rdparty/googletest/googlemock/msvc/2015/gmock_config.props b/3rdparty/googletest/googlemock/msvc/2015/gmock_config.props new file mode 100644 index 00000000000..77bc95b192d --- /dev/null +++ b/3rdparty/googletest/googlemock/msvc/2015/gmock_config.props @@ -0,0 +1,19 @@ + + + + ../../../googletest + + + <_ProjectFileVersion>10.0.30319.1 + + + + $(GTestDir)/include;%(AdditionalIncludeDirectories) + + + + + $(GTestDir) + + + diff --git a/3rdparty/googletest/googlemock/msvc/2015/gmock_main.vcxproj b/3rdparty/googletest/googlemock/msvc/2015/gmock_main.vcxproj new file mode 100644 index 00000000000..76cc68b9a39 --- /dev/null +++ b/3rdparty/googletest/googlemock/msvc/2015/gmock_main.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {E4EF614B-30DF-4954-8C53-580A0BF6B589} + gmock_main + Win32Proj + + + + StaticLibrary + Unicode + true + v140 + + + StaticLibrary + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + + + + Disabled + ../../include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + + + ../../include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + + + {34681f0d-ce45-415d-b5f2-5c662dfe3bd5} + true + true + + + + + ../../include;%(AdditionalIncludeDirectories) + ../../include;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/3rdparty/googletest/googlemock/msvc/2015/gmock_test.vcxproj b/3rdparty/googletest/googlemock/msvc/2015/gmock_test.vcxproj new file mode 100644 index 00000000000..76ea5534ad1 --- /dev/null +++ b/3rdparty/googletest/googlemock/msvc/2015/gmock_test.vcxproj @@ -0,0 +1,103 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {F10D22F8-AC7B-4213-8720-608E7D878CD2} + gmock_test + Win32Proj + + + + Application + Unicode + true + v140 + + + Application + Unicode + v140 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\ + $(OutDir)$(ProjectName)\ + false + + + + /bigobj %(AdditionalOptions) + Disabled + ..\..\include;..\..;$(GTestDir);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + Console + MachineX86 + + + + + /bigobj %(AdditionalOptions) + ..\..\include;..\..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + {e4ef614b-30df-4954-8c53-580a0bf6b589} + true + true + + + + + + + + + \ No newline at end of file diff --git a/3rdparty/googletest/googlemock/test/gmock-matchers_test.cc b/3rdparty/googletest/googlemock/test/gmock-matchers_test.cc index 78c4c901bf5..9f62c3d8266 100644 --- a/3rdparty/googletest/googlemock/test/gmock-matchers_test.cc +++ b/3rdparty/googletest/googlemock/test/gmock-matchers_test.cc @@ -613,7 +613,7 @@ TEST(MatcherCastTest, FromSameType) { struct ConvertibleFromAny { ConvertibleFromAny(int a_value) : value(a_value) {} template - ConvertibleFromAny(const T& /*a_value*/) : value(-1) { + explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; @@ -867,11 +867,15 @@ class Unprintable { public: Unprintable() : c_('a') {} - bool operator==(const Unprintable& /* rhs */) { return true; } private: char c_; }; +inline bool operator==(const Unprintable& /* lhs */, + const Unprintable& /* rhs */) { + return true; +} + TEST(EqTest, CanDescribeSelf) { Matcher m = Eq(Unprintable()); EXPECT_EQ("is equal to 1-byte object <61>", Describe(m)); diff --git a/3rdparty/googletest/googletest/cmake/internal_utils.cmake b/3rdparty/googletest/googletest/cmake/internal_utils.cmake index 93e6dbb7c19..8878dc1a959 100644 --- a/3rdparty/googletest/googletest/cmake/internal_utils.cmake +++ b/3rdparty/googletest/googletest/cmake/internal_utils.cmake @@ -46,7 +46,9 @@ endmacro() # Google Mock. You can tweak these definitions to suit your need. A # variable's value is empty before it's explicitly assigned to. macro(config_compiler_and_linker) - if (NOT gtest_disable_pthreads) + # Note: pthreads on MinGW is not supported, even if available + # instead, we use windows threading primitives + if (NOT gtest_disable_pthreads AND NOT MINGW) # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. find_package(Threads) endif() @@ -80,6 +82,10 @@ macro(config_compiler_and_linker) # http://stackoverflow.com/questions/3232669 explains the issue. set(cxx_base_flags "${cxx_base_flags} -wd4702") endif() + if (NOT (MSVC_VERSION GREATER 1900)) # 1900 is Visual Studio 2015 + # BigObj required for tests. + set(cxx_base_flags "${cxx_base_flags} -bigobj") + endif() set(cxx_base_flags "${cxx_base_flags} -D_UNICODE -DUNICODE -DWIN32 -D_WIN32") set(cxx_base_flags "${cxx_base_flags} -DSTRICT -DWIN32_LEAN_AND_MEAN") @@ -235,8 +241,16 @@ function(py_test name) # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known # only at ctest runtime (by calling ctest -c ), so # we have to escape $ to delay variable substitution here. - add_test(${name} - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) + add_test( + NAME ${name} + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$) + else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) + add_test( + ${name} + ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) + endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) endif() endfunction() diff --git a/3rdparty/googletest/googletest/include/gtest/gtest.h b/3rdparty/googletest/googletest/include/gtest/gtest.h index 9efba750829..f846c5bd669 100644 --- a/3rdparty/googletest/googletest/include/gtest/gtest.h +++ b/3rdparty/googletest/googletest/include/gtest/gtest.h @@ -1857,13 +1857,13 @@ class TestWithParam : public Test, public WithParamInterface { // AssertionResult. For more information on how to use AssertionResult with // these macros see comments on that class. #define EXPECT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_NONFATAL_FAILURE_) #define EXPECT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ GTEST_NONFATAL_FAILURE_) #define ASSERT_TRUE(condition) \ - GTEST_TEST_BOOLEAN_(condition, #condition, false, true, \ + GTEST_TEST_BOOLEAN_((condition), #condition, false, true, \ GTEST_FATAL_FAILURE_) #define ASSERT_FALSE(condition) \ GTEST_TEST_BOOLEAN_(!(condition), #condition, true, false, \ diff --git a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h b/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h index 0094ed5077e..92f4c11c4f6 100644 --- a/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h +++ b/3rdparty/googletest/googletest/include/gtest/internal/gtest-port.h @@ -396,10 +396,16 @@ # include # endif // In order to avoid having to include , use forward declaration -// assuming CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. +#if GTEST_OS_WINDOWS_MINGW +// MinGW defined _CRITICAL_SECTION and _RTL_CRITICAL_SECTION as two +// separate (equivalent) structs, instead of using typedef +typedef struct _CRITICAL_SECTION GTEST_CRITICAL_SECTION; +#else +// Assume CRITICAL_SECTION is a typedef of _RTL_CRITICAL_SECTION. // This assumption is verified by // WindowsTypesTest.CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION. -struct _RTL_CRITICAL_SECTION; +typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; +#endif #else // This assumes that non-Windows OSes provide unistd.h. For OSes where this // is not the case, we need to include headers that provide the functions @@ -1693,7 +1699,7 @@ class GTEST_API_ Mutex { // by the linker. MutexType type_; long critical_section_init_phase_; // NOLINT - _RTL_CRITICAL_SECTION* critical_section_; + GTEST_CRITICAL_SECTION* critical_section_; GTEST_DISALLOW_COPY_AND_ASSIGN_(Mutex); }; diff --git a/3rdparty/googletest/googletest/test/gtest-port_test.cc b/3rdparty/googletest/googletest/test/gtest-port_test.cc index 6ea607bc70d..05f8821e9a3 100644 --- a/3rdparty/googletest/googletest/test/gtest-port_test.cc +++ b/3rdparty/googletest/googletest/test/gtest-port_test.cc @@ -1295,9 +1295,16 @@ TEST(WindowsTypesTest, HANDLEIsVoidStar) { StaticAssertTypeEq(); } +#if GTEST_OS_WINDOWS_MINGW +TEST(WindowsTypesTest, _CRITICAL_SECTIONIs_CRITICAL_SECTION) { + StaticAssertTypeEq(); +} +#else TEST(WindowsTypesTest, CRITICAL_SECTIONIs_RTL_CRITICAL_SECTION) { StaticAssertTypeEq(); } +#endif + #endif // GTEST_OS_WINDOWS } // namespace internal diff --git a/3rdparty/googletest/googletest/test/gtest_list_tests_unittest.py b/3rdparty/googletest/googletest/test/gtest_list_tests_unittest.py index 925b09d9cb8..f2d2fd1b1c5 100644 --- a/3rdparty/googletest/googletest/test/gtest_list_tests_unittest.py +++ b/3rdparty/googletest/googletest/test/gtest_list_tests_unittest.py @@ -71,7 +71,7 @@ FooTest\. TypedTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -TypedTest/1\. # TypeParam = int\s*\* +TypedTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB TypedTest/2\. # TypeParam = .*MyArray @@ -80,7 +80,7 @@ TypedTest/2\. # TypeParam = .*MyArray My/TypeParamTest/0\. # TypeParam = (VeryLo{245}|class VeryLo{239})\.\.\. TestA TestB -My/TypeParamTest/1\. # TypeParam = int\s*\* +My/TypeParamTest/1\. # TypeParam = int\s*\*( __ptr64)? TestA TestB My/TypeParamTest/2\. # TypeParam = .*MyArray diff --git a/3rdparty/googletest/googletest/test/gtest_unittest.cc b/3rdparty/googletest/googletest/test/gtest_unittest.cc index 88e94134b94..97fcd5a8359 100644 --- a/3rdparty/googletest/googletest/test/gtest_unittest.cc +++ b/3rdparty/googletest/googletest/test/gtest_unittest.cc @@ -442,7 +442,7 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test { // tzset() distinguishes between the TZ variable being present and empty // and not being present, so we have to consider the case of time_zone // being NULL. -#if _MSC_VER +#if _MSC_VER || GTEST_OS_WINDOWS_MINGW // ...Unless it's MSVC, whose standard library's _putenv doesn't // distinguish between an empty and a missing variable. const std::string env_var = diff --git a/3rdparty/googletest/travis.sh b/3rdparty/googletest/travis.sh index 20fe3e393dd..bdecbd964db 100644 --- a/3rdparty/googletest/travis.sh +++ b/3rdparty/googletest/travis.sh @@ -12,4 +12,4 @@ cmake -Dgtest_build_samples=ON \ -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ ../../$GTEST_TARGET make -make test +CTEST_OUTPUT_ON_FAILURE=1 make test