gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,236 Commits 1 Branch 0 Tags 14 MiB
33b44c4b35
Commit Graph

1114 Commits

Author SHA1 Message Date
misterg
b492666068 Googletest export 
Internal Change

PiperOrigin-RevId: 222123106
 2018-11-20 13:29:55 -05:00
Abseil Team
45d66d81be Googletest export 
Point IWYU at an existent path.

PiperOrigin-RevId: 221797154
 2018-11-20 13:29:32 -05:00
durandal
8e86f67261 Googletest export 
Move the Matcher<T> interface to googletest so I can use it to extend death test regex matching in a subsequent change.

PiperOrigin-RevId: 221675910
 2018-11-20 13:29:20 -05:00
Gennadiy Civil
d5932506d6
Merge pull request #1961 from coppered/patch-1 
Update README.md
 2018-11-13 21:13:21 -05:00
Oleksandr Dyakov
1454f301c5
Update README.md 
added -std=c++11
 2018-11-13 02:29:46 +01:00
Robin Lindén
4802133690
Add back warning suppression that shouldn't have been removed 2018-11-10 16:14:19 +01:00
Robin Lindén
a3a42514f1
Define GTEST_DISABLE_MSC_WARNINGS_PUSH/POP for all compilers 2018-11-10 15:40:57 +01:00
Robin Lindén
c43603f288
Remove GTEST_HAS_HASH_SET/MAP check 2018-11-10 15:27:33 +01:00
Robin Lindén
826656b25f
Remove workarounds for unsupported MSVC versions 2018-11-10 15:20:26 +01:00
krzysio
105579a6e4 Googletest export 
Improve Bazel build files.

New target gtest_prod allows access to the FRIEND_TEST macro without depending on the entirety of GTest in production executables. Additionally, duplicate config_setting rules were removed and formatting was adjusted.

PiperOrigin-RevId: 220279205
 2018-11-07 14:37:18 -05:00
Gennadiy Civil
9636db6b2b
Merge branch 'master' into makefix 2018-11-01 10:45:47 -04:00
misterg
88c15b5fde Googletest export 
Adding GTEST_INTERNAL_DEPRECATED ability to mark deprecated

PiperOrigin-RevId: 219515184
 2018-11-01 10:42:23 -04:00
Benjamin Carman
4ea629d31d Added line to sample Makefile in googletest/googletest/make to specify use of C++11 in CXXFLAGS as required by the system 2018-11-01 02:25:08 -04:00
Abseil Team
71d4fc8d76 Googletest export 
[Fuchsia] Create the death test child process in a separate job.

This creates a separate job to launch the child process into. The
exception port can then be attached to the new job before the child
process is launched, solving a potential race condition.

PiperOrigin-RevId: 219366531
 2018-10-30 21:20:50 -04:00
misterg
e857f9cdd9 Googletest export 
Remove scoped_ptr replace with std::unique_ptr

PiperOrigin-RevId: 219291284
 2018-10-30 21:20:43 -04:00
Abseil Team
e0d3c37051 Googletest export 
Fix broken Fuchsia cc_test.

PiperOrigin-RevId: 219170936
 2018-10-30 21:20:35 -04:00
misterg
b9347b31c3 Googletest export 
Remove last traces of gtest-linked_ptr.h

PiperOrigin-RevId: 219164781
 2018-10-29 14:43:07 -04:00
Gennadiy Civil
e9085769d4 Merge pull request #1941 from barkovv:master 
PiperOrigin-RevId: 219134349
 2018-10-29 13:46:24 -04:00
misterg
80b43d900b Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 219129336
 2018-10-29 13:46:16 -04:00
Vadim Barkov
53d61b5b23 Replaced all NULLs with nullptr in googletest 2018-10-28 03:10:37 +03:00
Abseil Team
2e308484d9 Googletest export 
[Fuchsia] Make the child process stderr redirection use a socket.

This changes the stderr redirection mechanism for the child process in Fuchsia death tests to use a Zircon socket rather than fd redirection. This should improve performance and reliability of the redirection process.
This also includes some minor style cleanups.

PiperOrigin-RevId: 218903196
 2018-10-26 16:23:59 -04:00
Abseil Team
b57c703963 Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
 2018-10-26 14:19:59 -04:00
misterg
a50e4f05b3 Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
 2018-10-26 14:19:51 -04:00
Jeff VanDyke
c45631823c
Change CMake googletest download location in docs 
Change CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR
Able to use in a subfolder's CMakeLists.txt
 2018-10-24 16:41:14 -04:00
durandal
59f90a338b Googletest export 
Honor GTEST_SKIP() in SetUp().

PiperOrigin-RevId: 218387359
 2018-10-24 11:26:16 -04:00
Joel Anderson
9b637237bd add documentation of manual c++11 specification 
Per #1883, builds of Google Test may fail if the version C++ is not manually
set to C++11 during the build process.

Signed-off-by: Joel Anderson <joelanderson333@gmail.com>
 2018-10-23 20:28:43 -04:00
Gennadiy Civil
7b6b3be342
Update advanced.md 
Fixes #1802
 2018-10-23 17:27:38 -04:00
Gennadiy Civil
20eaf6e3a9 Merge pull request #1911 from BrukerJWD:isnice 
PiperOrigin-RevId: 218384341
 2018-10-23 15:13:42 -04:00
Gennadiy Civil
a743780ad0
Update advanced.md 
Fixes #1755
 2018-10-23 11:16:46 -04:00
Gennadiy Civil
b974af7923
Update advanced.md 
Fixes #1925
 2018-10-23 11:09:15 -04:00
Abseil Team
82987067d8 Googletest export 
Change ValuesArray to require much less template instantiation depth.

PiperOrigin-RevId: 218170842
 2018-10-22 11:29:14 -04:00
Gennadiy Civil
32dbcac06e Merge pull request #1839 from Peter-Levine:python3-tests 
PiperOrigin-RevId: 217925156
 2018-10-22 11:29:06 -04:00
Gennadiy Civil
572050dd28 Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix 
PiperOrigin-RevId: 217923705
 2018-10-22 11:28:57 -04:00
Gennadiy Civil
c955e33497
Merge branch 'master' into python3-tests 2018-10-19 13:30:13 -07:00
misterg
663ef8636a Googletest export 
New variadic implementation for gtest-param-test
Removed non-variadic implementation and added variadic for ValueArray and Values

PiperOrigin-RevId: 217703627
 2018-10-18 11:32:37 -04:00
Gennadiy Civil
3a7f0934d6 Merge pull request #1912 from kakkoko:fix-xml-name 
PiperOrigin-RevId: 217576541
 2018-10-18 11:32:30 -04:00
Abseil Team
29b47e45cf Googletest export 
C++11 code cleanup.

PiperOrigin-RevId: 217364243
 2018-10-18 11:32:16 -04:00
kakkoko
baf6845b18 Fix incorrect XML file name in help message 2018-10-17 10:09:09 +09:00
Gennadiy Civil
754cb8ed96
Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-12 12:44:33 -04:00
misterg
864b6c2d35 Remove duplicate functionality PrintValue (in googletest-param-test-test.cc), use testing::PrintToString 
PiperOrigin-RevId: 216733373
 2018-10-11 16:15:32 -04:00
KO Myung-Hun
b3b19a796c Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77 
Closes #1899

PiperOrigin-RevId: 216719020
 2018-10-11 13:31:25 -04:00
David Neto
ad997b16b5 Merge 4c92120d6dedb4eeb499a8702faea0224e0a8b23 into 658c6390a5 
Closes #1893

PiperOrigin-RevId: 216712426
 2018-10-11 12:52:55 -04:00
Aaron Dierking
e7327c13f6 Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5 
Accepts #1889

PiperOrigin-RevId: 216709878
 2018-10-11 12:44:07 -04:00
Abseil Team
bc6a4ce380 Project import generated by Copybara. 
PiperOrigin-RevId: 216423319
 2018-10-11 12:44:00 -04:00
misterg
0e71eb069a Internal Change 
PiperOrigin-RevId: 216417182
 2018-10-11 12:43:52 -04:00
Filipp Andjelo
095b3113e7 Use pcfiledir for prefix in pkgconfig file 
Using absolute paths in the pkg-config file makes it not relocatable and
leads to problems, when trying to use it with precompiled cross
toolchains. Setting prefix to relative path based on pcfiledir makes it
more reliable for such cases.
 2018-10-11 14:09:57 +02:00
Abseil Team
7d3b73c85a Unconditionally use std::tuple. 
Remove all mention of TR1 tuple and our own implementation of tuple.

PiperOrigin-RevId: 216395043
 2018-10-09 16:25:58 -04:00
Abseil Team
b652edb39c Apply [[noreturn]] to Abort() 
PiperOrigin-RevId: 216383938
 2018-10-09 16:25:44 -04:00
Gennadiy Civil
7a1e9114a4
Update Makefile.am 
Remove references to gtest tupe
 2018-10-09 15:47:46 -04:00
Gennadiy Civil
689ac9fbd0
Update BUILD.bazel 
Remove references to googletest-tuple-test.cc
 2018-10-09 15:42:49 -04:00
Gennadiy Civil
ac7ed4046c
Delete CHANGES 
We are not maintaining change log, it has not been touched for a very long time
 2018-10-09 11:15:26 -04:00
misterg
27c86f2941 always define define GTEST_LANG_CXX11 1 
PiperOrigin-RevId: 216184859
 2018-10-08 10:51:12 -04:00
Gennadiy Civil
3149e0e88b
Merge branch 'master' into python3-tests 2018-10-05 16:23:55 -04:00
Gennadiy Civil
40f82ce56a
Update primer.md 
fixes #1709
 2018-10-05 16:23:08 -04:00
misterg
07c4753a17 Remove pre-C++11 code from gtest-printers 
PiperOrigin-RevId: 215941759
 2018-10-05 15:17:01 -04:00
Abseil Team
f8a1481c0a Make GTestColor and ColoredPrintF available as internal APIs from gtest.h. This is for use in abseil exception safety testing. 
PiperOrigin-RevId: 215920581
 2018-10-05 12:54:28 -04:00
misterg
c28ce41590 Removed pre-C++11 IsContainerTest and IteratorTraits 
PiperOrigin-RevId: 215916605
 2018-10-05 12:54:21 -04:00
Abseil Team
4bb49ed640 Apply clang-tidy modernize-use-nullptr to googletest. 
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.

This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.

PiperOrigin-RevId: 215814400
 2018-10-05 12:54:14 -04:00
misterg
f13bbe2992 Remove checking for C++ 11 and a pre-C++11 test from googletest tests 
PiperOrigin-RevId: 215789971
 2018-10-04 16:10:50 -04:00
Gennadiy Civil
4b82df5bb3
Merge branch 'master' into python3-tests 2018-10-04 15:08:14 -04:00
1camper
bea3d61975 Merge d830440d48a9502161448bc78be33a53388dd1f4 into f5260ae757 
Closes #1830

PiperOrigin-RevId: 215563532
 2018-10-03 16:11:12 -04:00
Matthieu
f5260ae757 Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into e93da23920 
Closes #1836

PiperOrigin-RevId: 215461025
 2018-10-02 17:41:16 -04:00
Arseny Aprelev
00938b2b22 Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d 
Closes #1544
With refinements and changes

PiperOrigin-RevId: 215273083
 2018-10-02 13:03:28 -04:00
Gennadiy Civil
907ae9edad
Merge branch 'master' into python3-tests 2018-09-25 22:09:27 -07:00
Gennadiy Civil
707b3b25c8
Merge pull request #1855 from zach2good/issue1854_remove_i386_xcode10 
Issue #1854: remove support for i386 for XCode 10
 2018-09-25 21:44:35 -07:00
Abseil Team
2b016ca493 Googletest export 
Project import generated by Copybara.

PiperOrigin-RevId: 214456152
 2018-09-25 13:05:37 -04:00
misterg
b2788286d1 Googletest export 
Project import generated by Copybara.

PiperOrigin-RevId: 214441835
 2018-09-25 13:05:25 -04:00
Abseil Team
0fc5466dbb Googletest export 
Project import generated by Copybara.
Including recently accepted and merged PRs

PiperOrigin-RevId: 213856848
 2018-09-25 13:05:03 -04:00
Gennadiy Civil
a4f57cf49a
Merge branch 'master' into python3-tests 2018-09-25 00:10:15 -07:00
Zach Toogood
0272ff1aa0 Issue #1854: remove support for i386 for XCode 10 2018-09-24 16:02:12 +03:00
Gennadiy Civil
81c0b876b4
Formatting 2018-09-23 09:42:11 -07:00
Gennadiy Civil
6596471104
Formatting 2018-09-23 09:41:12 -07:00
Gennadiy Civil
5293383707
Formatting 2018-09-23 09:35:25 -07:00
Gennadiy Civil
78d3bfeb44
Formatting 2018-09-23 09:34:47 -07:00
Jonny007-MKD
67d3c0f6d7 Fix unit test 2018-09-23 16:39:13 +02:00
Jonny007-MKD
2b2b8d71c1 Fix ColoredOutputTest.UsesColorsWhenTermSupportsColors again 2018-09-23 15:50:29 +02:00
Jonny007-MKD
cecea92af8 Rename private member of AdditionalMessage 
Shorten lines in unit tests
 2018-09-23 15:46:47 +02:00
Jonny007-MKD
1cb10b357a Readded changes from 6494f5232b 2018-09-23 15:15:38 +02:00
Gennadiy Civil
90943525c5
Merge branch 'master' into python3-tests 2018-09-20 14:30:26 -04:00
Gennadiy Civil
8bf297233f
Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTest 
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
 2018-09-20 11:42:29 -04:00
misterg
8c547cff2e Googletest export 
Fixing broken OSS build, add missing include

PiperOrigin-RevId: 213812210
 2018-09-20 11:01:27 -04:00
Abseil Team
1b20bd176f Googletest export 
support printing std::reference_wrapper<T> in gUnit

PiperOrigin-RevId: 213270392
 2018-09-20 11:01:16 -04:00
Jonny007-MKD
6a1c3d9b78 Removed some newlines 2018-09-18 21:54:36 +02:00
Matthieu Longo
c9fe337ae2 [msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors 2018-09-18 18:29:42 +02:00
Jonny007-MKD
c40f55a229 Avoid these ambiguities 2018-09-15 09:00:39 +02:00
Peter Levine
149c0d2414 Fix Python3 support 2018-09-14 19:40:51 -04:00
Jonny007-MKD
6494f5232b Print message of unexpected std::exception in EXPECT_THROW, too 2018-09-14 23:22:04 +02:00
Jonny007-MKD
631e3a5838
Merge branch 'master' into master 2018-09-14 22:39:45 +02:00
misterg
bc9df6ad46 Googletest export 
Removing checks for C++11 from unit tests

PiperOrigin-RevId: 212990514
 2018-09-14 14:52:40 -04:00
Gennadiy Civil
1b2da360ed
Merge branch 'master' into master 2018-09-14 11:21:31 -04:00
Gennadiy Civil
abc803e288
Update README.md 2018-09-13 17:23:21 -04:00
Jonny007-MKD
82eeb009b2 Make it public again *sigh* 2018-09-13 14:49:15 +02:00
Jonny007-MKD
e86d1df3e1 Avoid implicit move operator 2018-09-13 14:13:23 +02:00
Jonny007-MKD
8c849c584c Try to fix gcc and clang issues 2018-09-13 13:57:27 +02:00
Jonny007-MKD
0354ccb049 Added special catch for std::exception in GTEST_TEST_NO_THROW_ 2018-09-13 10:24:10 +02: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
Arkady Shapkin
e6c407d605 Fix doc links 2018-09-04 23:07:18 +03: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
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
Gennadiy Civil
d615eebd9f
Merge branch 'master' into fix-clang-warnings 2018-08-31 10:57:16 -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 6a26e47cfc 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
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
1db4a426d4
Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-08-29 22:07:39 -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
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
ebb2fca51a
Merge branch 'master' into fix-1764_CMake-errors-in-googlemock 2018-08-27 13:25:45 -04:00
David Schuldenfrei
603ce4b81d Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7 
Closes #1658

Review and changes, mister@google.com

PiperOrigin-RevId: 210374286
 2018-08-27 12:22:33 -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
205df1058e
Merge branch 'master' into issue_1735 2018-08-24 11:30:02 -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
Stefano Soffia
aff0379441 Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02: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
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
misterg
5891bb5307 googletest export 
- 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457486
 2018-08-20 14:50:41 -04:00
Gennadiy Civil
9404c5ae04
Merge pull request #1754 from vkotovv/docs-advanced-broken-links 
docs: fixed broken references to sections in Advanced guide
 2018-08-20 11:04:11 -04:00
Gennadiy Civil
c1230dea6b
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Vadim Kotov
ddc618ab31
docs: fix more broken links to sections in Advanced guide 2018-08-20 16:20:14 +03:00
Vadim Kotov
02c4f1af9d
docs: fixed broken references to sections in Advanced guide 2018-08-20 15:31:55 +03:00
Gennadiy Civil
97274b1e94
Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil
a946f7db03
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil
d1c1aac781
Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning 
Remove default /EHsc compiler flag
 2018-08-17 23:27:19 -04:00
Tanzinul Islam
9d77e63e12 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-17 23:58:45 +01:00
Gennadiy Civil
2a380bc26d
Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Vadim Berezniker
0796415314 std references shouldn't be fully qualified 2018-08-17 10:49:10 -07:00
Gennadiy Civil
cda442da0b
Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil
edc1bc606e
Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil
88cd66513c
Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Conor Burgess
687964c84f
Merge branch 'master' into fix-argc 2018-08-17 17:15:32 +01:00
Gennadiy Civil
a9bd428e72
Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Henry Schreiner
a65a993a3c
Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
b1bfdf0bf4
Small formatting change 
And then we can merge
 2018-08-16 15:10:07 -04:00
Gennadiy Civil
8c86040dd6
Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil
c38f4b9f2c
Small style changes. 
Just small style changes and we can accept this PR
 2018-08-16 13:18:13 -04:00
Gennadiy Civil
f3a9fa6a62
Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil
1246e5807a
Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil
3c4f437c24
Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil
7e7e3a6f45
Merge branch 'master' into patch-1 2018-08-15 08:37:15 -07:00
Gennadiy Civil
02671abb44
Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil
f0e4c411ca more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
e26771776b
Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil
bbf738a2c1 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
265efde9a5 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
2421eff9f7
Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil
f225735222 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
caeaef302d
Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
tisi1988
87a37c60e3
Merge branch 'master' into master 2018-08-14 15:32:22 +02:00
Gennadiy Civil
c203bee245 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
9060e19c87 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Elias Daler
9ca399ae05 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil
47b57ff1b2
Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil
63baab8924 Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Yi Zheng
ecc241900a - Fix the broken markdown table 
- Fix some format issue
 2018-08-13 17:57:51 +08:00
Gennadiy Civil
390a6b7932 Mode change on a python script 2018-08-10 15:42:16 -04:00
Gennadiy Civil
b46b86ee60
Merge pull request #1719 from happyCoder92/master 
docs: fix broken links
 2018-08-09 10:54:09 -07:00
Gennadiy Civil
4e13415ff4
Merge branch 'master' into master 2018-08-09 10:40:06 -07:00
Gennadiy Civil
acaf5beacc formatting and small changes related to code management, no functionality changes 2018-08-09 13:37:11 -04:00
Gennadiy Civil
4d9411467d code management comments, [ci-skip], no functionality changes 2018-08-09 12:21:49 -04:00
Gennadiy Civil
7a79459a66 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:55:48 -04:00
Gennadiy Civil
d5b31df900
Update gtest-death-test.cc 2018-08-09 11:33:42 -04:00
Gennadiy Civil
ecc6944fb1 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:12:12 -04:00
Loo Rong Jie
24786cb498
Merge branch 'master' into deprecate 2018-08-09 20:08:44 +08:00
Wiktor Garbacz
db43df6df7 docs: fix broken links 2018-08-09 13:14:36 +02:00
tisi1988
efe27ac05c
Merge branch 'master' into master 2018-08-09 10:58:22 +02:00
Gennadiy Civil
11f5a2740a
Merge branch 'master' into cross-testing-patch-1 2018-08-08 12:19:04 -07:00
Gennadiy Civil
00fc0d24d1 Formatting tweaks, no functionality changes 2018-08-08 15:14:21 -04:00
Gennadiy Civil
0eeb1afcac code management changes, no functionalty changes 2018-08-08 14:41:21 -04:00
Gennadiy Civil
bdf5fd3a98 Merge branch 'master' of https://github.com/google/googletest 
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
 2018-08-08 13:20:02 -04:00
Gennadiy Civil
41e82cadf4 upsream additional printer test 2018-08-07 14:05:42 -04:00
Gennadiy Civil
b345bf9090 Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
tisi1988
e9b05a4d6a
Merge branch 'master' into master 2018-08-07 11:12:00 +02:00
Gennadiy Civil
886a74769e
Merge branch 'master' into suppressDefault 2018-08-06 18:02:42 -07:00
Wez
5d2e503574 No default exception handling 2018-08-03 16:26:16 -07:00
Gennadiy Civil
61f949387e
Merge branch 'master' into deprecate 2018-08-03 12:05:07 -04:00
Philipp Paulweber
1da26a77c5
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration 2018-08-03 12:01:30 +02:00
Gennadiy Civil
2a7077fa24 one more fix 2018-08-02 20:03:26 -07:00
Gennadiy Civil
b929d55704 cmake fixes 2018-08-02 17:46:43 -04:00
Gennadiy Civil
0d29f9702d more fixes 2018-08-02 17:32:43 -04:00
Gennadiy Civil
95c313e685 add --no_stacktrace_support for json-output-unittest 2018-08-02 16:58:11 -04:00
Gennadiy Civil
94f2c6faa7 fixes tests 2018-08-02 16:51:03 -04:00
Gennadiy Civil
677df883ec cmake test fixes 2018-08-02 16:24:09 -04:00
Gennadiy Civil
b7244ff37c cmake fixes 2018-08-02 16:01:00 -04:00
Gennadiy Civil
930f0f86e3 cmake tests changes 2018-08-02 15:45:23 -04:00
Gennadiy Civil
f3511bf1c7 cleaning up and adding test changes to CMake 2018-08-02 14:56:33 -04:00
Tanzinul Islam
1cd979a807 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-01 22:48:05 +01:00
Gennadiy Civil
bbc0ac9b1a Merge branch 'master' of https://github.com/google/googletest 2018-08-01 17:26:04 -04:00
Gennadiy Civil
5b9b39ff21 Corresponding CMake Changes 2018-08-01 17:25:56 -04:00
Gennadiy Civil
8dea630e88 various changes to tests 2018-08-01 17:06:17 -04:00
Gennadiy Civil
421f527df3 more test changes 2018-08-01 16:23:20 -04:00
Gennadiy Civil
7001dff4fc adding googletest-json-output unitest 2018-08-01 16:12:09 -04:00
Gennadiy Civil
09fc73dde9 more test changes 2018-08-01 15:34:30 -04:00
Gennadiy Civil
96077bc9f3 more tests changes 2018-08-01 15:02:28 -04:00
Gennadiy Civil
b888e23fce googletest list tests unitest 2018-08-01 13:49:29 -04:00
Gennadiy Civil
35aa4fe924 gtest catch exceptions test and gtest shuffle test 2018-08-01 13:32:07 -04:00
Gennadiy Civil
a28968d698 changes to googletest break on failure and googletest filter unittests 2018-08-01 11:46:43 -04:00
Gennadiy Civil
d75922ca1c changes for googletest env var test 2018-08-01 11:35:13 -04:00
Gennadiy Civil
38486eb03e googltest-color-test changes 2018-08-01 11:32:08 -04:00
Gennadiy Civil
6324796be1 googletest-output-test changes 2018-08-01 11:28:24 -04:00
Gennadiy Civil
16c65a476a
Merge branch 'master' into master 2018-08-01 11:09:34 -04:00
Gennadiy Civil
539ee4bc54 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
tisi1988
25e1436b08
Merge branch 'master' into master 2018-08-01 12:11:18 +02:00
Gennadiy Civil
6269264dfe
Merge branch 'master' into deprecate 2018-07-30 16:11:06 -04:00
Gennadiy Civil
f978c651ed
Merge branch 'master' into master 2018-07-30 14:01:17 -04:00
Gennadiy Civil
b7cb1bc6f9 small tweaks, OSS merge cl 206357486 2018-07-30 13:31:46 -04:00
Gennadiy Civil
ec13264af4 added missing comments 2018-07-27 15:05:20 -04:00
Gennadiy Civil
984cba30ed Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Gennadiy Civil
6cacb41935
Merge branch 'master' into deprecate 2018-07-26 13:04:53 -04:00
Piotr Kąkol
309e8a271e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
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
Victor Costan
8a6158717b Fix unused function warning on Mac OS. 
As of recently, Google Test fails to compile with the warning below when
used in projects with strict warning settings.

googletest/src/gtest-death-test.cc:1004:13: error: unused function 'StackGrowsDown' [-Werror,-Wunused-function]
 2018-02-19 02:02:59 -08:00
Gennadiy Civil
8dd1eb5984
Merge branch 'master' into fix-printers 2018-02-15 15:41:39 -05:00
Gennadiy Civil
a3e322b24f cleanup, merges 2018-02-13 15:25:57 -05:00
Gennadiy Civil
823f139bc7
Merge branch 'master' into fix-printers 2018-02-13 15:00:07 -05:00
Gennadiy Civil
09581b3852 cleanup/merges 2018-02-13 14:56:05 -05:00
Gennadiy Civil
069724197c merging, cleaning up 2018-02-13 14:13:52 -05:00
Gennadiy Civil
ab186a8c49 merges 2018-02-13 13:49:57 -05:00
Gennadiy Civil
30d276da03 cxxx11 2018-02-13 11:48:32 -05:00
Gennadiy Civil
3b1fe3ec45 clang warnings 2018-02-13 11:24:09 -05:00
Gennadiy Civil
d7c966c4de clang warnings 2018-02-13 11:15:03 -05:00
Gennadiy Civil
2a23ca0009 https://travis-ci.org/google/googletest/jobs/340995238 2018-02-13 11:05:01 -05:00
Gennadiy Civil
a66d209061 clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' 2018-02-13 10:23:42 -05:00
Gennadiy Civil
e76f4ee9fd clang warning https://travis-ci.org/google/googletest/jobs/340978022 2018-02-13 10:05:43 -05:00
Gennadiy Civil
9e072812e3 merges 2018-02-13 09:45:12 -05:00
Victor Costan
b3a1759eac Fix std::iscntrl use in gtest-printers.cc 
ContainsUnprintableControlCodes() in gtest-printers.cc passes a char
argument to std::iscntrl. Although its argument is an int, std::iscntrl
produces undefined behavior if its argument is not representable as an
unsigned char. The standard library on Windows asserts that the argument
is an unsigned char, resulting in an assertion crash on debug builds.
 2018-02-12 13:02:07 -08:00
Gennadiy Civil
d84f58ab10 Merging, coniniue 2018-02-12 14:07:45 -05:00
Conor Burgess
f11a8f9131
Merge branch 'master' into fix-argc 2018-02-12 17:35:07 +00:00
Gennadiy Civil
575c081227 merging 2018-02-09 17:45:10 -05:00
Gennadiy Civil
49fc378e0a merges 2018-02-09 16:02:17 -05:00
Gennadiy Civil
b324a36c35
Merge branch 'master' into assert 2018-02-09 11:42:05 -05:00