diff options
author | Gennadiy Civil <misterg@google.com> | 2019-02-20 20:22:42 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-02-20 20:22:43 (GMT) |
commit | 1411d27a944dc1997162c61dbcc0881cd56efdb1 (patch) | |
tree | 0161f505ed47eefc53daf631fe181dfdbcbab0cc /googletest | |
parent | c5a792d1b685f506fcfac24fde867856a6b94070 (diff) | |
parent | 91bfc0822855d39113301f4a483457b191aab50e (diff) | |
download | googletest-1411d27a944dc1997162c61dbcc0881cd56efdb1.zip googletest-1411d27a944dc1997162c61dbcc0881cd56efdb1.tar.gz googletest-1411d27a944dc1997162c61dbcc0881cd56efdb1.tar.bz2 |
Merge pull request #2061 from samolisov:building-with-bazel-as-a-dll-on-windows
PiperOrigin-RevId: 234845565
Diffstat (limited to 'googletest')
-rw-r--r-- | googletest/README.md | 2 | ||||
-rw-r--r-- | googletest/docs/advanced.md | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/googletest/README.md b/googletest/README.md index 23f67c3..747e7cf 100644 --- a/googletest/README.md +++ b/googletest/README.md @@ -252,7 +252,7 @@ command line. Generally, these macros are named like `GTEST_XYZ` and you define them to either 1 or 0 to enable or disable a certain feature. We list the most frequently used macros below. For a complete list, see file -[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/googletest/include/gtest/internal/gtest-port.h). +[include/gtest/internal/gtest-port.h](https://github.com/google/googletest/blob/master/include/gtest/internal/gtest-port.h). ### Multi-threaded Tests diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index ea9b80f..dbe6694 100644 --- a/googletest/docs/advanced.md +++ b/googletest/docs/advanced.md @@ -1198,7 +1198,7 @@ also supports per-test-suite set-up/tear-down. To use it: 1. Outside your test fixture class (typically just below it), define those member variables, optionally giving them initial values. 1. In the same test fixture class, define a `static void SetUpTestSuite()` - function (remember not to spell it as **`SetupTestSuite`** with a small `u`!) + function (remember not to spell it as **`SetUpTestSuite`** with a small `u`!) to set up the shared resources and a `static void TearDownTestSuite()` function to tear them down. @@ -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. + |