Commit Graph

2838 Commits

Author SHA1 Message Date
Gennadiy Civil
34d5d22b64
Merge pull request #1814 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-09-06 08:48:52 -04:00
misterg
0ddb6bf09b Googletest export
Internal Change

PiperOrigin-RevId: 211699161
2018-09-06 08:47:50 -04:00
Abseil Team
0d2262138c Googletest export
Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception

PiperOrigin-RevId: 211524592
2018-09-06 08:47:43 -04:00
Abseil Team
dbd55366c8 Googletest export
Make EXPECT_THROW print the actual exception type on the "threw the wrong exception type" case if the actual exception is a std::exception

PiperOrigin-RevId: 211519873
2018-09-06 08:47:36 -04:00
misterg
51cabc168f Googletest export
Project import

PiperOrigin-RevId: 211091791
2018-09-06 08:47:23 -04:00
Gennadiy Civil
0614a539f0
Merge pull request #1809 from KindDragon/fix-doc-links
Fix doc links
2018-09-05 14:08:31 -04:00
Arkady Shapkin
e6c407d605 Fix doc links 2018-09-04 23:07:18 +03:00
Gennadiy Civil
a2b149b239
Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfig
pkgconfig: Unconditionally depend on GTest when using GMock
2018-09-04 11:31:18 -04:00
Gennadiy Civil
990bf4ffd1
Merge branch 'master' into fix-gmock-pkgconfig 2018-09-04 10:59:31 -04:00
Gennadiy Civil
3787a483b9
Merge pull request #1803 from KindDragon/patch-2
Update documentation to syntax highlight code
2018-09-04 10:56:49 -04:00
Gennadiy Civil
25bf884321
Merge pull request #1806 from asiplas/master
Fix #1805: add `.md` to hyperlink
2018-09-04 10:55:52 -04:00
Andrew Siplas
70a7017582 Fix #1805: add .md to hyperlink 2018-09-03 22:13:52 -04:00
Arkady Shapkin
de9675986f Update documentation to syntax highlight code 2018-09-03 21:56:23 +03:00
David Seifert
79875d320e
pkgconfig: Unconditionally depend on GTest when using GMock
* GTest is a required dependency for GMock, hence
  we always need to pull it in.
2018-09-02 16:25:18 +02:00
Gennadiy Civil
c7a8998556
Update README.md 2018-08-31 11:56:04 -04:00
Gennadiy Civil
2fe3bd994b
Merge pull request #1433 from dsacre/fix-clang-warnings
Fix Clang warnings
2018-08-31 11:21:57 -04:00
Gennadiy Civil
d615eebd9f
Merge branch 'master' into fix-clang-warnings 2018-08-31 10:57:16 -04:00
Gennadiy Civil
4005388b3b
Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-08-31 10:50:06 -04:00
Gennadiy Civil
6dd60ec437
Update googletest-output-test-golden-lin.txt 2018-08-31 10:26:59 -04:00
Dominic Sacré
13c5230bbf Add user-defined copy constructor to ValueArray
Fix Clang warning:
| warning: definition of implicit copy constructor for 'ValueArray2<bool, bool>'
| is deprecated because it has a user-declared copy assignment operator [-Wdeprecated]
2018-08-31 14:57:23 +02:00
Dominic Sacré
8f279122de Add missing declarations for Google Tests flags
Add declarations for install_failure_signal_handler and flagfile.

Fix Clang warnings:
| warning: no previous extern declaration for non-static variable
| 'FLAGS_gtest_install_failure_signal_handler' [-Wmissing-variable-declarations]
| warning: no previous extern declaration for non-static variable
| 'FLAGS_gtest_flagfile' | [-Wmissing-variable-declarations]
2018-08-31 14:57:23 +02:00
Dominic Sacré
bb18e25d15 Make g_argvs static
Fix Clang warning:
| warning: no previous extern declaration for non-static variable 'g_argvs'
| [-Wmissing-variable-declarations]
2018-08-31 14:57:23 +02:00
Dominic Sacré
d41f53ae78 Make dummy variables static to avoid compiler warnings
Fix -Wmissing-variable-declarations warnings from Clang.
2018-08-31 14:57:23 +02:00
Dominic Sacré
e41f38b3b7 Re-generate gtest-param-test.h from gtest-param-test.h.pump
Commit 6a26e47cfc changed the formatting
of INSTANTIATE_TEST_CASE_P() in the generated header file only.

This commit reverts to the formatting produced by running "pump
gtest-param-test.h.pump", which seems to be more consistent with the
rest of the file.
2018-08-31 14:52:42 +02:00
Gennadiy Civil
76af254c47
Update googletest-output-test-golden-lin.txt
manual update golden lin
2018-08-30 21:46:15 -04:00
Gennadiy Civil
0ecf38f3a2
Update googletest-output-test-golden-lin.txt
manual update, golden lin
2018-08-30 21:42:07 -04:00
misterg
a5cc7aa3fe Googletest export
Fix broken OSS windows build.

PiperOrigin-RevId: 210969049
2018-08-30 21:33:10 -04:00
misterg
41b539941f Googletest export
Silence MSVC warnings

PiperOrigin-RevId: 210726964
2018-08-30 21:33:02 -04:00
Abseil Team
00d1ffc8c8 Googletest export
Fix the typed test names in the tests for customized typed test parameters.

As required by googletest documentation, the names should not contain an underscore.

PiperOrigin-RevId: 210678652
2018-08-30 21:32:54 -04:00
misterg
2cc008538c Googletest export
Internal Change

PiperOrigin-RevId: 210594341
2018-08-30 21:32:41 -04:00
Gennadiy Civil
b8e2562086
Merge pull request #1790 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-08-29 22:57:12 -04:00
Gennadiy Civil
9ad739833e
Update gmock-matchers.h 2018-08-29 22:32:08 -04:00
Gennadiy Civil
1db4a426d4
Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-08-29 22:07:39 -04:00
Gennadiy Civil
3dbba3b072 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 22:02:08 -04:00
Gennadiy Civil
fab2252646 Changing clang tp 3.9 as 3.7 no longer works on Travis 2018-08-29 21:58:47 -04:00
Gennadiy Civil
f1e529a808
clang 3.7 -> 3.9 2018-08-29 21:52:07 -04:00
Gennadiy Civil
d7d21c0b91
clang 3.7->3.9 2018-08-29 21:51:31 -04:00
Gennadiy Civil
a83e98d0e7
Update .travis.yml
Bring travil yml back to the master branch state
2018-08-29 21:21:42 -04:00
Gennadiy Civil
964748a902
Update .travis.yml 2018-08-29 21:16:33 -04:00
Gennadiy Civil
e8ebde4f21
Testing, trying to figure out clang errors
Possibly related to travis env
2018-08-29 12:37:54 -04:00
Gennadiy Civil
3d56121825
Merge pull request #1794 from BlueMonday/patch-1
Fix broken FAQ link in primer.md
2018-08-29 00:43:34 -04:00
Steven Santos Erenst
ca912f8b70
Fix broken FAQ link in primer.md
The current link pointed to a non existing section in the FAQ.
2018-08-28 21:03:19 -07:00
Gennadiy Civil
e103fa4f2a
Disable MCVS warnings 2018-08-28 23:55:17 -04:00
Gennadiy Civil
9b2016a01d
typo 2018-08-28 23:46:23 -04:00
Gennadiy Civil
e8e26d25bd
typo 2018-08-28 23:36:50 -04:00
Gennadiy Civil
8c0e0d5c17
MSVC warnings silence 2018-08-28 23:25:51 -04:00
Gennadiy Civil
9d9d7a6a89
Update googletest-output-test-golden-lin.txt 2018-08-28 23:11:51 -04:00
Abseil Team
65d03530e6 Googletest export
Fix line that was wrapping in the middle of a link

This looks uglier, but has the advantage that the link is kept in one
piece.

PiperOrigin-RevId: 210537337
2018-08-28 16:53:52 -04:00
Abseil Team
03867b5389 Googletest export
Add the possibility of specifying the name in type parameterized tests.

Similar to how the last parameter of INSTANTIATE_TEST_CASE_P allows to override the name for (non-type) parametrized tests, this adds the possibility of adding a parameter to INSTANTIATE_TYPED_TEST_CASE_P. The argument has to be a class, which contains a static templated function GetName<T>(int), returning the name for type T.

PiperOrigin-RevId: 210532231
2018-08-28 16:53:45 -04:00
Abseil Team
52f8183e7f Googletest export
Breaks Windows builds

PiperOrigin-RevId: 210434120
2018-08-28 16:53:38 -04:00