Commit Graph

2914 Commits

Author SHA1 Message Date
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
Gennadiy Civil
3bedb5a9fc
Merge pull request #2035 from syohex/update-xcode-project-file
Update Xcode project file
2018-12-28 11:21:32 -05:00
Syohei YOSHIDA
0cf2130c0b Update Xcode project file
Remove files which no longer exist.
2018-12-28 13:23:44 +09:00
Ryohei Machida
6729a13611 Merge #2002
PiperOrigin-RevId: 227030722
2018-12-27 15:31:14 -05:00
Gennadiy Civil
77004096e8
Update README.md 2018-12-27 12:04:11 -05:00
Gennadiy Civil
16269ae2f8 Merge pull request #2027 from ciband:chore/fix_library_json
PiperOrigin-RevId: 227028806
2018-12-27 11:52:54 -05:00
Chris Johnson
c0ef2cbe42
fix: Correct GitHub paths 2018-12-21 12:44:54 -06:00
Gennadiy Civil
1506131665
Update README.md 2018-12-21 13:24:39 -05:00
Gennadiy Civil
4160336cb4 Merge pull request #2013 from ciband:chore/fix_library_json
PiperOrigin-RevId: 226493373
2018-12-21 11:30:27 -05:00
Abseil Team
34a99e547a Googletest export
Get rid of code generation for NiceMock / StrictMock.
They got small enough that it doesn't make sense to generate them.

PiperOrigin-RevId: 226455689
2018-12-21 11:30:20 -05:00
Case, Matt
b93a13ec4d Improvements have been made to the example/sample makefiles for both googlemock
and googletest.
Library files are now created and named like versions produced
by Cmake.
2018-12-20 20:58:56 -06:00
Abseil Team
a83cc11abe Googletest export
Add public entry point testing::RegisterTest.

PiperOrigin-RevId: 226350937
2018-12-20 14:09:52 -05:00
Abseil Team
9494c45e75 Googletest export
Use std::function to implement type erasure in Action, wrapping the legacy
ActionInterface if necessary.

This makes functors / std::function the primary way to implement Action; the
existing ActionInterface implementations are handled through ActionAdaptor.
The existing actions are not (yet) migrated though; they'll pay the cost of one
additional indirection - but that should be negligible.

PiperOrigin-RevId: 226126137
2018-12-20 14:09:39 -05:00
Abseil Team
e26a3fa13c Googletest export
Unifdef c++11-related macros from googletest now that it requires C++11.

PiperOrigin-RevId: 225905601
2018-12-20 14:09:31 -05:00
misterg
9ab640ce5e Googletest export
Suppress C4503 for MCVS , again

PiperOrigin-RevId: 225895719
2018-12-17 17:57:39 -05:00
misterg
7515e39943 Googletest export
Suppress C4503 for MCVS

PiperOrigin-RevId: 225871050
2018-12-17 15:37:31 -05:00
Gennadiy Civil
85c4172ed6
Update README.md
Update build badge to point to the correct location
2018-12-17 14:03:51 -05:00
misterg
ed3f9bb229 Googletest export
Internal Change

PiperOrigin-RevId: 225849972
2018-12-17 13:53:46 -05:00
Abseil Team
b7dd66519f Googletest export
Remove GTEST_REFERENCE_TO_CONST_ usage from GMock. In C++11, it's redundant.

PiperOrigin-RevId: 225719210
2018-12-17 13:53:39 -05:00
Abseil Team
1ec20f87e3 Googletest export
Allow container matchers to accept move-only containers.

PiperOrigin-RevId: 225667441
2018-12-17 13:53:33 -05:00
Abseil Team
096fb37a19 Googletest export
Replace pump'd code for DoAll with variadic templates.

PiperOrigin-RevId: 225584656
2018-12-17 13:53:26 -05:00
Chris
0f698c830f chore: Add .vs to .gitignore for Visual Studio 2018-12-15 13:32:19 -06:00
Chris
1496f73cc4 fix: correct JSON syntax 2018-12-15 13:31:56 -06:00
Gennadiy Civil
b5f5c596a9 Merge pull request #2000 from ciband:feat/add_support_platformio
PiperOrigin-RevId: 225552792
2018-12-14 13:54:43 -05:00
Abseil Team
c6cb7e0335 Googletest export
Support skipped in XML and JSON output

PiperOrigin-RevId: 225386540
2018-12-13 16:00:21 -05:00
misterg
81f0026066 Googletest export
Internal Change

PiperOrigin-RevId: 225231727
2018-12-13 16:00:11 -05:00
Gennadiy Civil
3949c403c0
Update README.md
point build badge back to proper repo path
2018-12-13 14:04:11 -05:00
Abseil Team
6ef5913813 Googletest export
The gmock matchers have a concept of MatchAndExpain; where the details of the
matching are written to a "result listener". A matcher can avoid creating
expensive debug info by checking result_listener->IsInterested(); but,
unfortunately, the default matcher code (called from EXPECT_THAT) is always
"interested".

This change implements EXPECT_THAT matching to first run the matcher in a "not
interested" mode; and then run it a second time ("interested") only if the
match fails.

PiperOrigin-RevId: 225036073
2018-12-12 11:54:22 -05:00