Gennadiy Civil
ed1edf641d
Formatting changes, code sync
2018-07-25 10:24:13 -04:00
tisi1988
1ae4fdb790
Merge branch 'master' into master
2018-07-23 10:10:26 +02:00
Stian Valle
bb9fc6f66e
Update primer.md
2018-07-21 15:50:45 +02:00
Stian Valle
7abf99d941
Update primer.md
2018-07-21 15:40:57 +02:00
Stian Valle
baf2115a59
Update primer.md
2018-07-21 15:29:58 +02:00
Gennadiy Civil
fd4f7cc729
Merge branch 'master' into deprecate
2018-07-20 15:53:16 -04:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
1f9c668a04
Merge branch 'master' into deprecate
2018-07-19 11:07:10 -04:00
Gennadiy Civil
d41bfd732f
Fix link
2018-07-18 11:38:18 -04:00
Gennadiy Civil
7e73a7ae6e
Formatting and a link
2018-07-18 11:17:19 -04:00
Gennadiy Civil
20ef7944a4
Merge pull request #1667 from hckr/patch-1
...
Fix broken links to FAQ in primer.md
2018-07-18 10:21:46 -04:00
Gennadiy Civil
4abbb774c3
Merge branch 'master' of https://github.com/google/googletest
2018-07-17 17:47:54 -04:00
Gennadiy Civil
5437926b22
Docs sync
2018-07-17 17:47:25 -04:00
Jakub Młokosiewicz
021c308069
Fix broken links to FAQ in primer.md
2018-07-17 00:49:31 +02:00
Loo Rong Jie
3a8d744030
Disable MSVC function deprecation when using Clang
2018-07-13 21:23:28 +08:00
Derek Mauro
82670da613
Merge branch 'master' into stacktrace
2018-07-12 16:51:04 -04:00
Derek Mauro
6c7878a151
Adds the UniversalPrinter for absl::variant.
2018-07-12 13:46:50 -04:00
tisi1988
de6e079f15
Merge branch 'master' into master
2018-07-12 11:06:08 +02:00
Wojciech Kaluza
421e7b4f29
Remove default /EHsc compiler flag
...
This prevents warning D9025 (one command-line option overrides
another) on MSVC builds: some test targets are built with
the /EHs-c- which conflicts with /EHsc.
2018-07-11 22:54:05 +01:00
Gennadiy Civil
d91b0de99e
Merge branch 'master' into googletest_for_asam
2018-07-11 10:08:04 -04:00
Gennadiy Civil
36066cfecf
more formatting [skip ci]
2018-07-11 09:42:48 -04:00
Gennadiy Civil
74cccf494a
formatting, [ci skip]
2018-07-11 09:38:47 -04:00
Gennadiy Civil
4f9194286c
Fix heading
...
[skip ci]
2018-07-10 17:30:28 -04:00
Gennadiy Civil
50daf299c2
Docs sync
...
[ci skip]
2018-07-10 17:16:03 -04:00
Derek Mauro
d772e2039b
Pass the --no_stacktrace_support argument to the CMake tests
...
This does the same thing to the CMake tests that is done to the
Bazel tests, and now makes the CMake tests pass.
2018-07-10 15:39:23 -04:00
Derek Mauro
4c41787764
Adds stacktrace support from Abseil to Google Test
...
This change adds the ability to generate stacktraces in Google Test on
both failures of assertions/expectations and on crashes. The
stacktrace support is conditionally available only when using Abseil
with Google Test.
To use this support, run the test under Bazel with a command like this:
bazel test --define absl=1 --test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1 //path/to/your:test
The "--define absl=1" part enables stacktraces on assertion/expectation
failures.
The "--test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" part enables
the signal handler that logs a stacktrace in the event of a crash
(this also requires the "--define absl=1" part). This is not the
default since it may interfere with existing tests.
2018-07-10 14:30:42 -04:00
medithe
b50b2f775e
Cast the tr1::tuple_element template parameter to int
...
Because in `std::tr1::tuple_element` the first template parameter should be of type int (https://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.4/a00547.html ), but the code inserts a size_t, the first template parameter should be casted to int before, to get rid of the following errors:
googletest-src/googletest/include/gtest/gtest-printers.h:957:60: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion]
struct tuple_element : ::std::tr1::tuple_element<I, Tuple> {};
and
googletest-src/googletest/include/gtest/gtest-printers.h:961:56: error: conversion from ‘long unsigned int’ to ‘int’ may change value [-Werror=conversion]
const typename ::std::tr1::tuple_element<I, Tuple>::type>::type get(
2018-07-09 13:36:46 +02:00
杜修杏
03ea2fdecb
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
2018-06-29 11:19:46 +08:00
tisi1988
dfddc98718
FIX: Compilation warning with GCC regarding a non-initialised member from MutexBase class.
2018-06-27 22:49:04 +02:00
Rohan Joyce
0563b52d3a
Eliminate GTEST_TEST_FILTER_ENV_VAR_.
...
GTEST_TEST_FILTER_ENV_VAR_ was used to specify an environment variable to obtain
the default test filter from. By default it was unset which broke
"--test_filter" for bazel. This CL eliminates GTEST_TEST_FILTER_ENV_VAR_ and
explicitly obtains the default test filter from the environment variable
TESTBRIDGE_TEST_ONLY if it exists.
2018-06-14 15:45:55 -04:00
Takuto Ikuta
a0d43a7bb8
Merge branch 'master' into stdstring
2018-06-14 09:34:15 +09:00
Gennadiy Civil
3847aecb5f
Docs sync/internal
2018-06-13 14:29:26 -04:00
Gennadiy Civil
6a484baf06
Doc sync/internal
2018-06-13 14:26:24 -04:00
Gennadiy Civil
c83e83eda0
Merge branch 'master' into stdstring
2018-06-13 10:51:02 -04:00
Takuto Ikuta
f4d0631a39
Reduce the number of strcmp calling while initialization
...
When we do parallel test execution with a process for a test,
initialization of gtest become performance bottleneck when the test
binary contains many testcases.
Especially, some parameterlized test in chromium browser affected by
largely when address sanitizer is enabled.
Address sanitizer does not allow using optimized strcmp function and
test addition in parameterized test require lookup of test case using
strcmp.
This patch reduces the number of strcmp, it is called when registering
parameterized test. Using reverse iterator improves the time to find
registered tests in such case.
Some tests for chromium browser using address sanitizer finished 2x
faster with this patch.
2018-06-13 05:53:18 +09:00
Gennadiy Civil
025f48f89b
Sync with internal docs
2018-06-11 16:11:55 -04:00
Gennadiy Civil
95a96e1c1d
Sync with internal docs
2018-06-11 13:12:14 -04:00
Gennadiy Civil
0b958a03e9
Removed "Documentation.md" not adding value and not consitent with internal docs
2018-06-11 12:07:45 -04:00
Gennadiy Civil
109f848bc8
Rename Samples.md to samples.md and adjust the links
2018-06-11 11:54:27 -04:00
Gennadiy Civil
4490be8789
Rename FAQ.md to faq.md and adjust the links.
...
Part of documentation rationalization
2018-06-11 11:49:02 -04:00
Gennadiy Civil
f213b6399e
Merge branch 'master' of https://github.com/google/googletest
2018-06-11 11:40:46 -04:00
Gennadiy Civil
8f87d00398
Rename AdvancedGuide.md to advanced.md and adjust the links.
...
Part of documentation rationalization work
2018-06-11 11:40:35 -04:00
Gennadiy Civil
de47b0d30c
Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation
2018-06-11 11:26:16 -04:00
Fabrice de Gans-Riberi
d437209cd0
Fuchsia: Change fdio include path.
2018-06-07 15:46:29 -07:00
Gennadiy Civil
2d136e5ec4
Merge branch 'master' into fuchsia-launchpad-removal
2018-06-04 18:00:20 +02:00
Gennadiy Civil
f66ab00704
Upstream, cl/199129756
...
Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
2018-06-04 10:45:56 -04:00
Fabrice de Gans-Riberi
93e267a999
Clean up
2018-05-31 11:21:01 -07:00
Fabrice de Gans-Riberi
0a6edf3ca7
Remvoe launchpad dependency from Fuchsia.
2018-05-30 18:17:35 -07:00
Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
Gennadiy Civil
32c84be0fc
Merge branch 'master' into unused-variable-fuchsia
2018-05-22 06:01:05 -07:00
James Dennett
49ecebd1f2
Downgrade to C++98.
...
Some projects cannot handle C++11 yet.
2018-05-21 12:27:52 -07:00
James Dennett
ec2c911b33
Downgrade to C++98 code.
...
Some users are not ready for C++11 yet.
2018-05-21 10:59:24 -07:00
James Dennett
89286a4cdf
Merge branch 'master' into StdLibVersioning
2018-05-21 10:57:01 -07:00
Tanzinul Islam
3280099951
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2018-05-13 11:42:21 +01:00
Fabrice de Gans-Riberi
f91bf75cf9
Remove unused variable in Fuchsia.
2018-05-11 10:38:48 -07:00
James Dennett
54e331b88b
Add support for versioned standard libraries.
...
This canonicalizes demangled names by omitting a nested inline namespace within namespace std if the name of the nested namespace begins with a double underscore. This improves compatibility with libc++.
2018-05-10 22:39:19 -07:00
James Dennett
fc66ae45fc
Update generated code.
2018-05-10 22:36:50 -07:00
James Dennett
b8fa4d2754
Add unit test for CanonicalizeForStdLibVersioning.
2018-05-10 22:33:29 -07:00
Jae Heon Lee
18abd8f512
Use NULL instead of nullptr, for pre-C++11 builds.
2018-05-09 13:03:57 -07:00
Jae Heon Lee
ec5ad0f869
Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase objects would return failures registered at TestCase and UnitTest scopes, respectively.
2018-05-07 14:09:37 -07:00
Tanzinul Islam
10f05a627c
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2018-05-05 19:53:33 +01:00
Fabrice de Gans-Riberi
960149f913
Remove magic number
2018-05-03 13:57:51 -07:00
Fabrice de Gans-Riberi
242f0f623c
Style fix
2018-05-03 13:44:42 -07:00
Fabrice de Gans-Riberi
8497540f39
Fix comments
2018-05-03 13:42:31 -07:00
Fabrice de Gans-Riberi
13af91faff
Fix more stuff and get tests to pass
2018-05-03 12:06:45 -07:00
Fabrice de Gans-Riberi
96c3c422ad
Get all the things to work.
2018-05-02 14:57:56 -07:00
Fabrice de Gans-Riberi
b6cb5c3e40
Fix stuff
2018-05-01 18:43:55 -07:00
Fabrice de Gans-Riberi
d4b5281d11
Add Fuchsia support for death test.
2018-05-01 16:22:09 -07:00
Gennadiy Civil
c13ab6003b
merging
2018-04-11 13:20:36 -04:00
Gennadiy Civil
6f9db26159
merging
2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725
merging
2018-04-10 16:22:50 -04:00
Gennadiy Civil
39c58da187
merge
2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 15:57:16 -04:00
Gennadiy Civil
ca54b67303
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
c1d4c34233
this should be it
2018-04-09 16:13:45 -04:00
Gennadiy Civil
f5871009e6
yet more
2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
57d6e824b4
more
2018-04-09 15:33:56 -04:00
Gennadiy Civil
cb13dc759c
more warnings
2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22
more MSVC warnings
2018-04-06 11:17:45 -04:00
Henry Fredrick Schreiner
b22e8dec40
Clean up cache non-advanced variable for subproject
2018-04-05 13:40:26 +02:00
Gennadiy Civil
fbe3c94533
Merge branch 'master' into fix_locale_win
2018-04-04 13:58:55 -04:00
fo40225
a0c27bd8a5
fix build break on locale windows
2018-04-04 23:16:16 +08:00
Gennadiy Civil
1776ed8c1e
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-04 11:06:09 -04:00
Gennadiy Civil
98687b7847
Merge branch 'master' into int3
2018-04-03 16:31:59 -04:00
Gennadiy Civil
18be012457
Merge branch 'master' into int3
2018-04-03 16:27:32 -04:00
Gennadiy Civil
d52aaee8eb
Upstreaming, cl 191344765
2018-04-03 16:14:35 -04:00
Gennadiy Civil
27507429cb
Merge branch 'master' into int3
2018-04-03 11:44:23 -04:00
Gennadiy Civil
a2dd136578
merging port, cont. 191443078
2018-04-03 11:38:30 -04:00
Gennadiy Civil
aa349acb07
merging, cont - 2
2018-04-03 11:23:54 -04:00
Gennadiy Civil
2cedd5b9c1
merging gtest-port.h , 191439094
2018-04-03 11:06:20 -04:00
Gennadiy Civil
04d1e56bd2
merging, just comments format
2018-04-03 09:56:23 -04:00
Gennadiy Civil
5beb452bbe
testing, merge
2018-04-03 09:45:49 -04:00
Gennadiy Civil
df5a48da03
Testing, gtest-port.h merge
2018-04-03 09:31:10 -04:00
Gennadiy Civil
87a4cdddd0
merging gtest-port.h, again - 1
2018-04-02 14:22:24 -04:00
Tanzinul Islam
5c7c365d5f
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2018-04-01 13:43:57 +01:00
Roland Leißa
b1d18b85bd
Merge branch 'master' into int3
2018-03-30 03:16:20 +02:00
Gennadiy Civil
b2373c6f51
Revert "merging gtest-port 1 of N"
2018-03-29 13:28:29 -04:00
Gennadiy Civil
54bb165ffd
Revert "merging gtest-port, 2"
2018-03-29 13:27:11 -04:00
Roland Leißa
e10ea42274
Merge remote-tracking branch 'google/master' into int3
2018-03-29 16:39:40 +02:00
Roland Leißa
d04bf07fad
typo
2018-03-29 16:38:23 +02:00
Gennadiy Civil
8e0364a37b
merging gtest-port, 2
2018-03-29 09:46:13 -04:00
Roland Leißa
11855d8ef0
provide alternative for DebugBreak()
...
This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
2018-03-28 23:45:51 +02:00
Gennadiy Civil
aea6fc32aa
merging gtest-port 1 of N
2018-03-27 15:19:40 -04:00
Gennadiy Civil
a75a5c9706
merges 1
2018-03-26 13:14:00 -04:00
Gennadiy Civil
3df7cbe6f7
merges, gtest
2018-03-26 13:04:28 -04:00
Gennadiy Civil
4e89c76db8
reverting gtest_list_tests_unittest.py
2018-03-22 12:37:38 -04:00
Gennadiy Civil
da71e8c870
more merges
2018-03-22 10:58:18 -04:00
Gennadiy Civil
0f6567954f
more merges
2018-03-22 10:56:35 -04:00
Gennadiy Civil
691e38e518
More merges
2018-03-21 16:31:31 -04:00
Gennadiy Civil
a3c2e107ae
cl 189032107, again
2018-03-16 15:56:31 -04:00
Gennadiy Civil
080fcbe0aa
cl 189032107
2018-03-16 13:36:36 -04:00
Gennadiy Civil
a178cc7ef7
merge, again, IsRecursiveContainer
2018-03-15 14:31:37 -04:00
Gennadiy Civil
262aaf2f1d
erging, cont
2018-03-14 10:49:18 -04:00
Gennadiy Civil
2814b4b089
merging, merging
2018-03-13 16:02:05 -04:00
Gennadiy Civil
a719320a3c
fixing, was removing too much
2018-03-13 11:53:27 -04:00
Gennadiy Civil
5461f63d01
Merge branch 'master' of https://github.com/google/googletest
2018-03-13 11:13:58 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Bernhard Bauer
fc437ef4b2
Merge branch 'master' into upstream_188748737
2018-03-12 18:15:35 +00:00
Bernhard Bauer
7b70413e0c
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
cf9d6344d2
merges-port(1)
2018-03-12 11:51:44 -04:00
Gennadiy Civil
e891900666
Merging, XML tests
2018-03-07 15:57:55 -05:00
Gennadiy Civil
89d6f70f34
merges-8
2018-03-05 15:53:36 -05:00
Gennadiy Civil
995a9dfa69
merges-7
2018-03-05 15:21:48 -05:00
Gennadiy Civil
086825de5d
merges-6
2018-03-05 14:21:41 -05:00
Gennadiy Civil
8385928428
merges-3
2018-03-05 13:51:39 -05:00
Gennadiy Civil
a518bd5cf2
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b
Merges-1
2018-03-05 12:26:15 -05:00
Tanzinul Islam
a7a7f51d35
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2018-03-05 02:25:59 +00:00
Petr Hosek
7a2050d4d7
Use a full message in the JSON output for failures
...
The full message unlike summary also includes stack trace.
2018-03-01 13:19:34 -08:00
Gennadiy Civil
3817871beb
Merge branch 'master' into json
2018-02-28 14:39:17 -05:00
Gennadiy Civil
66d71756a7
Merge branch 'master' into debug-postfix
2018-02-28 08:43:57 -05:00
Petr Hosek
6baf17e9d1
Support JSON output format in addition to XML
...
This change allows emitting output in JSON format in addition to the
already supported XML format. The implementation as well as the file
structure is intentionally modelled after the XML one.
2018-02-28 00:48:41 -08:00
Gennadiy Civil
ce61dc54a2
Merge pull request #1423 from pcc/win-libcxx2
...
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
2018-02-27 14:00:29 -05:00
Gennadiy Civil
ab46d9550b
Merge branch 'master' into debug-postfix
2018-02-27 13:19:35 -05:00
Victor Costan
84ec2e0365
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
d4f77c1e3a
Merge branch 'master' into win-libcxx2
2018-02-27 10:00:29 -05:00
David Neto
20074be19a
Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
...
CMAKE_DEBUG_POSTFIX is a global configuration parameter, and
changing it pollutes the configuration space for other projects
that enclose this project.
DEBUG_POSTFIX is better to use since it is a target-specific poperty.
Fixes #1334
Fixes #1268
2018-02-26 15:58:49 -05:00
Gennadiy Civil
aa31660d18
Merge branch 'master' into master
2018-02-26 11:14:34 -05:00
Gennadiy Civil
4dbb437174
merging unittests - 5
2018-02-26 09:51:27 -05:00
Gennadiy Civil
004f6a00b2
merging unitests - check 4
2018-02-23 15:27:11 -05:00
Gennadiy Civil
29e9ca8774
merging unitests, check
2018-02-23 11:29:35 -05:00
Gennadiy Civil
3299a2386c
merging unittests - 2
2018-02-23 11:07:18 -05:00
Gennadiy Civil
b7e0294c51
merging unitests
2018-02-23 10:47:11 -05:00
Anders Sundman (asum)
11e1dd257b
Removed trailing comma in enum
2018-02-23 14:55:24 +01:00
Aleksey Kozin
99bb4fe85a
Merge branch 'master' into patch-1
2018-02-23 01:38:54 +03:00
Aleksey Kozin
06568301ec
TEST() arguments are invalid in an example
...
Both names must be valid C++ identifiers, and they should not contain underscore (`_`)
2018-02-23 01:34:26 +03:00
Gennadiy Civil
ac138b6885
Merge branch 'master' into fix-death-warn
2018-02-22 16:34:27 -05:00
Gennadiy Civil
32e62da22a
Merge pull request #1469 from gennadiycivil/master
...
merges
2018-02-22 16:09:17 -05:00
Gennadiy Civil
df65632489
merges
2018-02-22 15:53:14 -05:00