diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-02-13 14:07:25 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-13 14:07:26 -0500 |
| commit | f73b2fb39efcac92d3e9fe079e4f7c809baa975e (patch) | |
| tree | eec3eadc05465c92f3b88c2fe6b076b462a6490c | |
| parent | ea43be9d1a781b73dbd573954ee4a371c233a583 (diff) | |
| parent | f4d3cdb65753608a7708c681f9ae6248dafcfe3d (diff) | |
| download | googletest-f73b2fb39efcac92d3e9fe079e4f7c809baa975e.tar.gz | |
Merge pull request #2114 from knuto:pr/libtool_support
PiperOrigin-RevId: 233773676
| -rw-r--r-- | googletest/cmake/libgtest.la.in | 21 | ||||
| -rw-r--r-- | googletest/docs/advanced.md | 9 |
2 files changed, 25 insertions, 5 deletions
diff --git a/googletest/cmake/libgtest.la.in b/googletest/cmake/libgtest.la.in new file mode 100644 index 00000000..840c8388 --- /dev/null +++ b/googletest/cmake/libgtest.la.in @@ -0,0 +1,21 @@ +# libgtest.la - a libtool library file +# Generated by libtool (GNU libtool) 2.4.6 + +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# Names of this library. +library_names='libgtest.so' + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='@CMAKE_INSTALL_FULL_LIBDIR@' diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md index acb7f240..ea9b80fc 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)\x0A Actual: 3\x0AExpected: 2", + "message": "Value of: add(1, 1)\n Actual: 3\nExpected: 2", "type": "" }, { - "message": "Value of: add(1, -1)\x0A Actual: 1\x0AExpected: 0", + "message": "Value of: add(1, -1)\n Actual: 1\nExpected: 0", "type": "" } ] @@ -2463,7 +2463,7 @@ could generate this report: "classname": "" } ] - } + }, { "name": "LogicTest", "tests": 1, @@ -2517,4 +2517,3 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when running the tests. **Availability**: Linux, Windows, Mac. - |