eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,628 Commits 13 Branches 14 Tags
Commit Graph

275 Commits

Author SHA1 Message Date
Gennadiy Civil
5c87ce09b5 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
033c81bd1f Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil
92be48af66 More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Bernhard Bauer
77965a7da1 Merge branch 'master' into upstream_188748737 2018-03-12 18:15:35 +00:00
Bernhard Bauer
cb2dd89007 Allow macros inside of parametrized test names. 
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.

Upstream of cr/188748737.

Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
 2018-03-12 18:14:06 +00:00
Gennadiy Civil
2cb5677ab7 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
7ee36bdbea merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
78797f38ef Merges-1 2018-03-05 12:26:15 -05:00
Gennadiy Civil
80cd2a3c67 Merge pull request #1423 from pcc/win-libcxx2 
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
 2018-02-27 14:00:29 -05:00
Victor Costan
8921d82a1c Switch default death test style back to "fast". 
Google Test has recently (02/09/2018) switched the default death test
style from "fast" to "threadsafe" in
ec7faa943d

Threadsafe death tests have been used internally for a while, and are
proven to be a better default.

However, adopting this better default can be challenging for large
projects with a significant investment in custom infrastructure built on
top of Google Test. The same custom infrastructure can make it difficult
for large projects to switch back to the old default by passing in
--gtest_death_test_style=fast.

For the reasons above, the default switch is considered too disruptive,
and this CL reverts it. This CL also introduces the
GTEST_DEFAULT_DEATH_TEST_STYLE preprocesor macro, which replaces the
hard-coded default. The macro can be defined in
gtest/internal/custom/gtest-port.h by projects that are ready to migrate
to thread-safe death tests.
 2018-02-27 07:50:03 -08:00
Gennadiy Civil
37cc7fb79a Merge branch 'master' into win-libcxx2 2018-02-27 10:00:29 -05:00
Anders Sundman (asum)
8d0e9cade8 Removed trailing comma in enum 2018-02-23 14:55:24 +01:00
Gennadiy Civil
47607b5a5e cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil
551f80ffcb cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil
2c7e37af6f merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil
2848f99c65 merges 2018-02-09 16:02:17 -05:00
Gennadiy Civil
c6e347c75f Merge branch 'master' into assert 2018-02-09 11:42:05 -05:00
Gennadiy Civil
521a3dcbfe Merge pull request #1446 from tholsapp/master 
Fixed typos
 2018-02-09 11:34:26 -05:00
Gennadiy Civil
1fb2e10cfe merges 2018-02-09 10:41:09 -05:00
Troy Holsapple
a2866dfdf5 Fixed typos 2018-02-07 22:06:00 -08:00
Alexey Sokolov
d20708cf0b Add ability to throw from ASSERT 
while not losing benefits of EXPECT, and not killing the whole test,
as with --gtest_throw_on_failure.

183822976
 2018-02-08 01:15:42 +00:00
Gennadiy Civil
d9df92287e Merges and also adding new bazel build mode 2018-01-31 12:05:18 -05:00
Gennadiy Civil
9f2c3d4cac Code merges 2018-01-30 17:34:22 -05:00
Gennadiy Civil
735ae77a8f Ability to optionally depend on Abseil plus upstream of 183716547 2018-01-30 11:42:03 -05:00
Peter Collingbourne
bf92c203ea Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. 
_HAS_EXCEPTIONS is specific to the MSVC STL and defining it to 0 causes
problems with libc++, so libc++ users may leave it undefined. This can
cause GTEST_HAS_EXCEPTIONS to be defined incorrectly if the user has
disabled exceptions via the compiler, which can lead to build errors.

_CPPUNWIND is a builtin macro provided by the compiler so it should
work with both STLs.
 2018-01-25 14:15:43 -08:00
Gennadiy Civil
6da2cd7c70 upstream cl 182543808 2018-01-24 13:04:36 -05:00
Gennadiy Civil
370cdcdcba Merge branch 'master' into win-libcxx 2018-01-23 12:32:44 -05:00
Gennadiy Civil
325bdd33f3 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil
7e2564f4cf Merge branch 'master' into support_xboxone 2018-01-18 17:42:34 -05:00
Gennadiy Civil
f2c8ff56a9 Merge branch 'master' into win-libcxx 2018-01-18 17:41:36 -05:00
Peter Collingbourne
4185169167 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++. 
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
 2018-01-17 20:29:10 -08:00
Fedor Trushkin
4e1156e10c Expose ScopedTrace utility in public interface 2018-01-17 16:41:59 +01:00
Gennadiy Civil
81b270392c Reverting some changes, need to make the merge compile 2018-01-15 18:16:11 -05:00
Gennadiy Civil
01e9531d3e Reverting some changes, need to make the merge compile 2018-01-15 17:39:33 -05:00
Gennadiy Civil
9faac7603b Reverting some changes, need to make the merge compile 2018-01-15 17:36:45 -05:00
Gennadiy Civil
a4e5067656 Reverting some changes, need to make the merge compile 2018-01-15 17:34:46 -05:00
Gennadiy Civil
c06b7f29cd More code merges 2018-01-15 16:23:23 -05:00
Gennadiy Civil
153f625dd3 Code merging 2018-01-15 16:06:32 -05:00
gpetit
25a2ba9501 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 2018-01-12 10:20:26 -05:00
Gennadiy Civil
9b205752b2 continue upstream/merge, etc 2018-01-11 17:36:34 -05:00
Gennadiy Civil
4c0c906987 Upstream cl 103120214 2018-01-11 11:31:23 -05:00
Gennadiy Civil
ee7f9fd88e More merge, cleanup 2018-01-10 16:49:20 -05:00
Gennadiy Civil
4695a1108e More merge, cleanup 2018-01-10 16:45:59 -05:00
Gennadiy Civil
091c46ed6e Code merge, upstreaming accumulated changes, cleanup 2018-01-10 14:42:29 -05:00
Gennadiy Civil
a230988e5b revert 2018-01-10 14:00:52 -05:00
Gennadiy Civil
9fc04da090 code merges, cleanup 2018-01-10 13:58:00 -05:00
Gennadiy Civil
28368f8f74 code merge, cleanups 2018-01-09 22:46:17 -05:00
Gennadiy Civil
9b54fda880 Upstream of cl 129104714 2018-01-09 16:41:15 -05:00
Gennadiy Civil
062f5f05b3 Revert one file 2018-01-09 15:46:44 -05:00
Gennadiy Civil
823b5a8545 wip, cleanups/merge 2018-01-09 14:48:06 -05:00