eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2120 from ngie-eign:clang-compile-with-basic-warns-flags

Browse Source 
PiperOrigin-RevId: 233762520
This commit is contained in:
Gennadiy Civil 2019-02-13 11:56:17 -05:00
commit e5e846da7f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/cmake/internal_utils.cmake
View File

@ -77,6 +77,10 @@ macro(config_compiler_and_linker)
# Suppress "unreachable code" warning # Suppress "unreachable code" warning
# http://stackoverflow.com/questions/3232669 explains the issue. # http://stackoverflow.com/questions/3232669 explains the issue.
set(cxx_base_flags "${cxx_base_flags} -wd4702") set(cxx_base_flags "${cxx_base_flags} -wd4702")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(cxx_base_flags "-Wall -Wshadow -Werror")
set(cxx_exception_flags "-fexceptions")
set(cxx_no_exception_flags "-fno-exceptions")
elseif (CMAKE_COMPILER_IS_GNUCXX) elseif (CMAKE_COMPILER_IS_GNUCXX)
set(cxx_base_flags "-Wall -Wshadow -Werror") set(cxx_base_flags "-Wall -Wshadow -Werror")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0)

9
googletest/docs/advanced.md
View File

@ -2430,7 +2430,7 @@ could generate this report:
"failures": 1, "failures": 1,
"errors": 0, "errors": 0,
"time": "0.035s", "time": "0.035s",
"timestamp": "2011-10-31T18:52:42Z", "timestamp": "2011-10-31T18:52:42Z"
"name": "AllTests", "name": "AllTests",
"testsuites": [ "testsuites": [
{ {
@ -2447,11 +2447,11 @@ could generate this report:
"classname": "", "classname": "",
"failures": [ "failures": [
{ {
"message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2", "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2",
"type": "" "type": ""
}, },
{ {
"message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0", "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0",
"type": "" "type": ""
} }
] ]
@ -2463,7 +2463,7 @@ could generate this report:
"classname": "" "classname": ""
} }
] ]
}, }
{ {
"name": "LogicTest", "name": "LogicTest",
"tests": 1, "tests": 1,
@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
running the tests. running the tests.
**Availability**: Linux, Windows, Mac. **Availability**: Linux, Windows, Mac.