Commit Graph

2641 Commits

Author SHA1 Message Date
Hugo Lindström
718bb65acf Avoid dynamic/static runtime linking (LNK4098) by properly replacing MD(d)->MT(d) in both C and CXX flags, resolves 2074 2019-01-28 21:07:41 +01:00
Gennadiy Civil
5ec7f0c4a1 Merge pull request #2079 from acozzette:fix-dist
PiperOrigin-RevId: 230902623
2019-01-25 11:01:36 -05:00
Adam Cozzette
46b81732b6 Fixed "make dist"
I made a few updates to the Makefile.am files so that "make dist"
succeeds and produces a usable tarball. We need this for protobuf
because the protobuf tarballs include a bundled copy of googletest.
2019-01-24 14:51:40 -08:00
Gennadiy Civil
bf07131c1d Merge pull request #2041 from ciband:chore/fix_library_json
PiperOrigin-RevId: 230554814
2019-01-23 13:27:16 -05:00
Abseil Team
fdc59ffd05 Googletest export
Add AllOfArray matcher that verifies a value matches all member of some array/container/list/set/..., e.g:
EXPECT_THAT(1, AnyOfArray({1, 2, 3}))
In the simplest form this is identical to AnyOf(1, 2, 3). But unlike that one it works on containers.

Add AnyOfArray matcher that verifies a value matches any member of some
array/container/list/set/...

PiperOrigin-RevId: 230403653
2019-01-23 13:27:08 -05:00
Abseil Team
569fba4d74 Googletest export
Make internal FunctionMocker class final

PiperOrigin-RevId: 230332778
2019-01-22 13:12:13 -05:00
Abseil Team
9518a57428 Googletest export
Fix mocking method arguments with templated copy constructors.

A previous change removed workarounds for old compilers from googletest and googlemock. Unfortunately, a bit of code that started as a workaround for Symbian's C++ compiler is still needed to avoid copy/move constructor ambiguity when mocking functions with certain argument types.

The test case added by this CL is extracted from Chrome's codebase, and was discovered while attempting to roll googletest.

PiperOrigin-RevId: 229801765
2019-01-18 14:06:03 -05:00
Abseil Team
0adeadd283 Googletest export
Refactor the `Invoke` and `InvokeWithoutArgs` actions:
 - Replace pump'd classes and functions with templates.
 - Make the polymorphic actions be polymorphic functors instead.
 - Fix Invoke(Callback*) to work with subclasses of the callbacks, instead of trying to diagnose that in gmock_doctor.

PiperOrigin-RevId: 229604112
2019-01-17 14:41:08 -05:00
misterg
eb9225ce36 Googletest export
Change remaining samples to use new Test Suite API

PiperOrigin-RevId: 229231566
2019-01-14 17:02:11 -05:00
Abseil Team
9acd065a90 Googletest export
Add move-only argument support to almost all remaining matchers.

PiperOrigin-RevId: 229030728
2019-01-14 17:02:03 -05:00
Abseil Team
097407fd3c Googletest export
Deduplicate testing::ReferenceWrapper with std::reference_wrapper.
Minor cleanups in matchers_test.

PiperOrigin-RevId: 229022872
2019-01-14 17:01:56 -05:00
misterg
0599a7b841 Googletest export
Change tests to use new Test Suite API

PiperOrigin-RevId: 228908894
2019-01-11 13:59:22 -05:00
Gennadiy Civil
2edadcedf3
Workaround homebrew issue 2019-01-10 18:20:44 -05:00
Gennadiy Civil
6693e85b04 Merge branch 'master' of github.com:google/googletest 2019-01-10 16:33:42 -05:00
Abseil Team
bc1023b413 Googletest export
Fix warning about deprecation of implicit operations such as copy constructors or assignment operators.

Specifically:

MatcherBase's default copy constructor, assignment operator, move operator, and move assignment operator are now declared explicitly rather than depending on the compiler implicit generation (which is disallowed/warned against due to MatcherBase's declaration of the destructor).

PiperOrigin-RevId: 228573333
2019-01-10 16:32:37 -05:00
Abseil Team
7a7e2bba1d Googletest export
...text exposed to GitHub repo https://www.github.com/google/googletest

PiperOrigin-RevId: 228573333
2019-01-10 16:18:48 -05:00
gennadiycivil
50f1a77955 Merge pull request #2051 from enptfb55:master
PiperOrigin-RevId: 228337465
2019-01-08 11:51:17 -05:00
misterg
f31bf1d362 Googletest export
Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054

PiperOrigin-RevId: 228334305
2019-01-08 11:51:05 -05:00
Abseil Team
216c37f057 Googletest export
Drop generated file gmock-generated-internal-utils.h.

PiperOrigin-RevId: 228232195
2019-01-08 11:50:56 -05:00
Chris
45c58aa6f3 fix: Add Arduino setup()/loop() functions back
Added setup()/loop() functions back to *_main.cc files to support compiling in CI.  Future features could enable this for the end user.
2019-01-07 12:37:34 -06:00
gennadiycivil
644319b9f0 Merge pull request #2048 from ciband:chore/clang_tidy
PiperOrigin-RevId: 228173023
2019-01-07 12:09:34 -05:00
Abseil Team
b6cd405286 Googletest export
Fix GTEST_IS_NULL_LITERAL_ for types that have magic implicit conversions.

PiperOrigin-RevId: 227879345
2019-01-07 12:09:25 -05:00
Sal Amato
8369b5bbd0 fixing build errors for unused parameter 2019-01-06 06:24:26 -05:00
Chris
ade8baa7d2 clang-tidy: modernize-deprecated-headers 2019-01-05 11:21:56 -06:00
Chris
23e6937873 misc: Reapply Arduino functions 2019-01-03 21:23:06 -06:00
Chris
202dcabf39 misc: Revert formatting changes. 2019-01-03 21:22:00 -06:00
Chris
fd1c7976ae Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest into chore/fix_library_json 2019-01-03 21:15:19 -06:00
Chris Johnson
0ffa5f9779
Merge branch 'master' into chore/fix_library_json 2019-01-03 21:13:20 -06:00
Chris
23533009b8 chore: Add Windows cmake files to .gitignore 2019-01-03 21:06:20 -06:00
Chris
adc5045cbf chore: Alphabetize exclude directories. 2019-01-03 21:01:02 -06:00
Gennadiy Civil
3880b13e4c
Merge pull request #2042 from gennadiycivil/master
Update Docs TestCase->TestSuite
2019-01-03 21:36:19 -05:00
Gennadiy Civil
58e62f7a98 Merge branch 'master' of https://github.com/google/googletest 2019-01-03 17:18:32 -05:00
Gennadiy Civil
5d3a2cd9c8 Update docs, TestCase->TestSuite 2019-01-03 17:18:03 -05:00
misterg
827515f8a0 Googletest export
Fixes #1261

PiperOrigin-RevId: 227740670
2019-01-03 16:40:27 -05:00
misterg
3a460a26b7 Googletest export
TestCase->TestSuite refactoring

PiperOrigin-RevId: 227702164
2019-01-03 16:40:20 -05:00
Chris
0c0ca90382 fix: Correct *_main.cc paths 2019-01-03 12:14:40 -06:00
Chris
4d62b5b9ae fix: Remove Arduino entry points
Improved flexibility by removing the Arduino entry points in favor of manual calls to setup/loop that the user can call from their entry point.  This is the more common use case for Arudino.

Also added the gtest/gmock_main files to the PlatformIO ignore list since we are not supporting that feature.
2019-01-03 12:12:19 -06:00
Gennadiy Civil
ac8c102dae
Update README.md 2019-01-03 11:41:41 -05:00
Gennadiy Civil
6e410a3ae9
Update README.md 2019-01-03 11:41:17 -05:00
Gennadiy Civil
8a27d164cb
Update README.md 2019-01-03 11:40:37 -05:00
Gennadiy Civil
bfcc47fc2f
Merge pull request #2026 from justin6case/example_makefile_improvements
Example/sample makefile improvements
2019-01-03 11:38:47 -05:00
Gennadiy Civil
1bcbd5871e Merge pull request #2037 from ciband:chore/fix_library_json
PiperOrigin-RevId: 227615222
2019-01-02 21:39:36 -05:00
misterg
14c2fba734 Googletest export
Internal Change

PiperOrigin-RevId: 227575279
2019-01-02 16:51:40 -05:00
Abseil Team
f8b1c1af17 Googletest export
Remove the #ifs for old, unsupported and buggy compilers:
* old versions of GCC & MSVC
* Symbian

PiperOrigin-RevId: 227116941
2019-01-02 16:51:33 -05:00
Gennadiy Civil
933e5df283
Merge pull request #2039 from gennadiycivil/master
Remove outdated scripts
2019-01-02 16:23:06 -05:00
Gennadiy Civil
8ed34e0f6b Remove outdated scripts 2019-01-02 16:03:50 -05:00
Gennadiy Civil
2ace910a35 Revert "test, please ignore"
This reverts commit 4665eee10a.
2019-01-02 16:02:34 -05:00
Gennadiy Civil
25905b9f9a Merge branch 'master' of https://github.com/google/googletest 2019-01-02 15:49:22 -05:00
Chris
de99386b67 Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest into chore/fix_library_json 2018-12-29 12:57:33 -06:00
Chris
6d5ce40d4c fix: Add additional source and include directories.
This is still a work in progress.
2018-12-29 12:57:04 -06:00