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

Merge pull request #2113 from knuto:pr/set_old_gtest_ver

Browse Source 
PiperOrigin-RevId: 233748252
This commit is contained in:
Gennadiy Civil 2019-02-13 10:24:59 -05:00
commit 75c3396099
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/CMakeLists.txt
View File

@ -40,8 +40,12 @@ endif()
# as ${gtest_SOURCE_DIR} and to the root binary directory as # as ${gtest_SOURCE_DIR} and to the root binary directory as
# ${gtest_BINARY_DIR}. # ${gtest_BINARY_DIR}.
# Language "C" is required for find_package(Threads). # Language "C" is required for find_package(Threads).
# Project version:
if (CMAKE_VERSION VERSION_LESS 3.0) if (CMAKE_VERSION VERSION_LESS 3.0)
project(gtest CXX C) project(gtest CXX C)
set(PROJECT_VERSION ${GOOGLETEST_VERSION})
else() else()
cmake_policy(SET CMP0048 NEW) cmake_policy(SET CMP0048 NEW)
project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C) project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)

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)\x0A Actual: 3\x0AExpected: 2", "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2",
"type": "" "type": ""
}, },
{ {
"message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0",
"type": "" "type": ""
} }
] ]
@ -2463,7 +2463,7 @@ could generate this report:
"classname": "" "classname": ""
} }
] ]
} },
{ {
"name": "LogicTest", "name": "LogicTest",
"tests": 1, "tests": 1,
@ -2517,4 +2517,3 @@ 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.