diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-07 23:03:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 23:03:09 -0400 |
| commit | f3500ce23a0e3c6e970830a61e2e3d4e9518d646 (patch) | |
| tree | 9a68c90af5bbc8e87b1f5a652e6b01395aa26da5 | |
| parent | a33b6b091999d44f771761be03beb64d3af2350a (diff) | |
| parent | 6c0146fd0075aae0beb394c19285a8869745cc2c (diff) | |
| download | googletest-f3500ce23a0e3c6e970830a61e2e3d4e9518d646.tar.gz googletest-f3500ce23a0e3c6e970830a61e2e3d4e9518d646.tar.bz2 googletest-f3500ce23a0e3c6e970830a61e2e3d4e9518d646.zip | |
Merge pull request #1243 from aninf-wo/hethi/travis-release-build
switch one Trevis build to Release mode
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 | ||||
| -rw-r--r-- | googletest/test/gtest-param-test_test.cc | 4 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ad6dc19c..db1338df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ script: ./travis.sh env: matrix: - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=Debug VERBOSE=1 - - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS=-std=c++11 + - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 notifications: email: false sudo: false diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index ce947337..9915c11f 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -98,7 +98,7 @@ macro(config_compiler_and_linker) set(cxx_no_exception_flags "-D_HAS_EXCEPTIONS=0") set(cxx_no_rtti_flags "-GR-") elseif (CMAKE_COMPILER_IS_GNUCXX) - set(cxx_base_flags "-Wall -Wshadow") + set(cxx_base_flags "-Wall -Wshadow -Werror") set(cxx_exception_flags "-fexceptions") set(cxx_no_exception_flags "-fno-exceptions") # Until version 4.3.2, GCC doesn't define a macro to indicate diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc index 857f6c5e..d1b0644f 100644 --- a/googletest/test/gtest-param-test_test.cc +++ b/googletest/test/gtest-param-test_test.cc @@ -857,8 +857,8 @@ TEST_P(CustomLambdaNamingTest, CustomTestNames) {} INSTANTIATE_TEST_CASE_P(CustomParamNameLambda, CustomLambdaNamingTest, Values(std::string("LambdaName")), - [](const ::testing::TestParamInfo<std::string>& info) { - return info.param; + [](const ::testing::TestParamInfo<std::string>& tpinfo) { + return tpinfo.param; }); #endif // GTEST_LANG_CXX11 diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index f84def90..745c9506 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -2096,7 +2096,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment { }; // This will test property recording outside of any test or test case. -static Environment* record_property_env = +Environment* record_property_env GTEST_ATTRIBUTE_UNUSED_ = AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment); // This group of tests is for predicate assertions (ASSERT_PRED*, etc) |