3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-09 13:45:24 +08:00
Code Issues Projects Releases Wiki Activity
2,307 Commits 7 Branches 27 Tags 38 MiB
Commit Graph

2307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
f46c174d1c
Merge pull request #1835 from google/gennadiycivil-TR1-docs-cleanup 
Remove TR1 mentions
 2018-09-14 11:15:41 -04:00
Gennadiy Civil
abc803e288
Update README.md 2018-09-13 17:23:21 -04:00
Gennadiy Civil
5c89346def
Update README.md 2018-09-13 17:22:16 -04:00
Gennadiy Civil
cfe0ae8678
Merge pull request #1831 from anthraxx/fix/version 
version: fix declared version to be in sync with CMakeLists.txt
 2018-09-13 10:35:19 -04:00
Gennadiy Civil
2649c22181
Merge pull request #1834 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-13 09:33:13 -04:00
misterg
0cd3c2e8b4 Googletest export 
Project import generated by Copybara.

PiperOrigin-RevId: 212678005
 2018-09-13 09:32:20 -04:00
misterg
21d52d3a1d Googletest export 
Project import generated by Copybara.

PiperOrigin-RevId: 212656749
 2018-09-13 09:32:12 -04:00
misterg
e1b8d82fa6 Googletest export 
Internal Change

PiperOrigin-RevId: 212656679
 2018-09-13 09:32:01 -04:00
Levente Polyak
c4ef6f3a05 version: fix declared version to be in sync with CMakeLists.txt 2018-09-13 00:50:17 +02:00
Gennadiy Civil
5131cf737c
Merge pull request #1828 from gdsotirov/patch-1 
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env
 2018-09-12 14:45:36 -04:00
Gennadiy Civil
ca247e1797
Merge branch 'master' into patch-1 2018-09-12 14:24:36 -04:00
Gennadiy Civil
d25268a55f
Merge pull request #1829 from google/gennadiycivil-patch-1 
Update appveyor.yml
 2018-09-12 11:42:08 -04:00
Gennadiy Civil
5eee7a343b
Update appveyor.yml 2018-09-12 10:33:31 -04:00
Georgi D. Sotirov
94046c91db
Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation error (with -Werror) 
The unused attribute was removed with commit 3299a23 on 2018-02-23, but it currently breaks build of 1.8.1, because of -Werror GCC parameter as reported in issue #1825.
 2018-09-12 10:44:52 +03:00
Gennadiy Civil
4d066127be
Merge pull request #1827 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-09-11 14:41:57 -04:00
misterg
db405ff8c3 Googletest export 
Project import sync

PiperOrigin-RevId: 212450488
 2018-09-11 12:59:19 -04:00
misterg
936dae4efe Googletest export 
Internal Change

PiperOrigin-RevId: 211798074
 2018-09-11 12:59:06 -04:00
Gennadiy Civil
0c799d0436
Merge pull request #1820 from Romain-Geissler/fix-gcc-misleading-indentation-warning-again 
Fix gcc misleading indentation again.
 2018-09-10 21:23:02 -04:00
Romain Geissler
93b05da26c Fix gcc misleading indentation again. 2018-09-10 01:45:14 +02:00
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
release-1.8.1 		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 6a26e47cfcc174cc85651cbde0b0158d03321e2f 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
Abseil Team
167c5e8188 Googletest export 
Fix Theta(N^2) memory usage of EXPECT_EQ(string) when the strings don't match.

The underlying CalculateOptimalEdits() implementation used a simple
dynamic-programming approach that always used N^2 memory and time. This meant
that tests for equality of large strings were ticking time bombs: They'd work
fine as long as the test passed, but as soon as the strings differed the test
would OOM, which is very hard to debug.
I switched it out for a Dijkstra search, which is still worst-case O(N^2), but
in the usual case of mostly-matching strings, it is much closer to linear.

PiperOrigin-RevId: 210405025
 2018-08-28 16:53:30 -04:00
misterg
1bb76182ca Googletest export 
Code Cleanup

PiperOrigin-RevId: 210393771
 2018-08-28 16:53:17 -04:00
Gennadiy Civil
58f3f1005c
Merge pull request #1784 from DavidSchuldenfrei/add-adapter-to-readme 
New Readme.md
 2018-08-27 22:50:46 -04:00
David Schuldenfrei
b3d210612c New Readme.md 2018-08-27 22:27:58 +03:00
Gennadiy Civil
2e68926a9d
Merge pull request #1769 from dakotahawkins/fix-1764_CMake-errors-in-googlemock 
Use `$<INSTALL_PREFIX>` in `target_include_directories`
 2018-08-27 14:13:59 -04:00
Gennadiy Civil
ebb2fca51a
Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
Gennadiy Civil
641e7a3752
Update CONTRIBUTING.md 2018-08-27 13:06:43 -04:00
David Schuldenfrei
603ce4b81d Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
 2018-08-27 12:22:33 -04:00
Abseil Team
a0e62d9f1a No longer require a functor passed to ResultOf matcher to define result_of type. 
This makes ResultOf more convenient to use. In particular, the matcher now accepts
lambdas.

PiperOrigin-RevId: 210118509
 2018-08-27 12:22:26 -04:00
Dakota Hawkins
b19292e6b6
Use $<INSTALL_PREFIX> in target_include_directories 
To make sure packages are relocatable, use `$<INSTALL_PREFIX>` in
`$<INSTALL_INTERFACE:...>` `target_include_directories`.

`$<INSTALL_PREFIX>` was introduced in CMake 2.8.11, which is already
being checked for locally.

References:

- https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#id19
- https://github.com/robotology/how-to-export-cpp-library/blob/claudio/headeronly/src/LibTemplateCMake/CMakeLists.txt#L42

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
 2018-08-24 16:51:55 -04:00
Gennadiy Civil
9c96f500a3
Merge pull request #1781 from wfvining/fix1764-cmake-errors 
Fix #1764 Remove cmake code that leads to a configuration error
 2018-08-24 16:49:47 -04:00
Will Vining
08aa7c67dd Fix #1764 Remove cmake code that leads to a configuration error 
This step is no longer necessary. The configuration given in the
googletest README.md is sufficient to bring in all the googlemock
headers.
 2018-08-24 12:52:32 -06:00
Gennadiy Civil
c3d9db428a
Update README.md 2018-08-24 13:25:40 -04:00
Gennadiy Civil
bf98ce2bba
Merge pull request #1767 from jschloss-swift/issue_1735 
Issue #1735 It seems like CMAKE_CXX_FLAGS is getting double appended when buildin…
 2018-08-24 11:56:17 -04:00
Gennadiy Civil
205df1058e
Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -04:00
Gennadiy Civil
7f11b9ffb5
Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-23 20:00:01 -04:00
misterg
87494afca7 Googletest export 
Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732
 2018-08-23 16:03:46 -04:00
srz_zumix
9dae300121 Googletest export 
Internal Change

PiperOrigin-RevId: 209498445
 2018-08-23 16:03:39 -04:00
srz_zumix
dc72f7c3b4 Googletest export 
Internal Change

PiperOrigin-RevId: 209471987
 2018-08-23 16:03:31 -04:00
Jacob Schloss
6de39826aa
Merge branch 'master' into issue_1735 2018-08-22 12:55:43 -07:00
Jacob Schloss
6e79801645 It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project, 
which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.

Removing this fixes it and seems to keep the same compile options, just removing the duplicate definition.
 2018-08-22 11:17:32 -07:00
Gennadiy Civil
1d9a1912e7
Merge pull request #1338 from stefanosoffia/master 
Install CMake export files
 2018-08-22 13:05:06 -04:00
Stefano Soffia
aff0379441 Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02:00
Gennadiy Civil
880896c6f4
Merge pull request #1682 from dakotahawkins/improve-exported-targets 
Improve CMake exported targets
 2018-08-21 13:51:42 -04:00
Dakota Hawkins
759ef7c4e9
Improve CMake exported targets. 
I _think_ this represents some of the "best practices" for exporting
targets. They'll be available in a `googletest::` namespace (e.g.
`googletest::gmock`) with non-namespaced `ALIAS` targets.

- Added GOOGLETEST_VERSION variable
- Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
 2018-08-21 13:02:09 -04:00
Gennadiy Civil
b88511ef64
Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 
Fix scoped enum not working in gmock-gen.py
 2018-08-21 10:32:21 -04:00
Gennadiy Civil
a6e7ba27c7
Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil
735bd75f69
Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil
ecd844de90
Merge pull request #1759 from gennadiycivil/master 
merge
 2018-08-20 15:42:27 -04:00
Gennadiy Civil
6c8c74ecee merge 2018-08-20 14:57:53 -04:00
misterg
df428ec118 googletest export 
- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457654
 2018-08-20 14:50:48 -04:00