diff options
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 4 | ||||
| -rw-r--r-- | googletest/docs/advanced.md | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 489223a..1909faf 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -77,6 +77,10 @@ macro(config_compiler_and_linker) # Suppress "unreachable code" warning # http://stackoverflow.com/questions/3232669 explains the issue. 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) set(cxx_base_flags "-Wall -Wshadow -Werror") if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index ea9b80f..acb7f24 100644 --- a/googletest/docs/advanced.md +++ b/googletest/docs/advanced.md @@ -2430,7 +2430,7 @@ could generate this report: "failures": 1, "errors": 0, "time": "0.035s", - "timestamp": "2011-10-31T18:52:42Z", + "timestamp": "2011-10-31T18:52:42Z" "name": "AllTests", "testsuites": [ { @@ -2447,11 +2447,11 @@ could generate this report: "classname": "", "failures": [ { - "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2", + "message": "Value of: add(1, 1)\x0A Actual: 3\x0AExpected: 2", "type": "" }, { - "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0", + "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", "type": "" } ] @@ -2463,7 +2463,7 @@ could generate this report: "classname": "" } ] - }, + } { "name": "LogicTest", "tests": 1, @@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when running the tests. **Availability**: Linux, Windows, Mac. + |