Commit Graph

2601 Commits

Author SHA1 Message Date
Jonathan Wendeborn
a69718965a Use existing Mock::GetReactionOnUninterestingCalls() 2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
ad519f83db Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
7014070b27 Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Jerry Turcios
d360657d43 Merge branch 'master' of https://github.com/google/googletest 2018-10-12 19:02:15 -04:00
Gennadiy Civil
af5df9cbca Merge pull request #1908 from rwoldberg:master
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
2e8ddd72be Change types to remove cast warnings. 2018-10-12 11:12:55 -06:00
Gennadiy Civil
eef8b1644f Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-12 12:44:33 -04:00
Jerry Turcios
caf0ce5ee3 Merge branch 'master' of https://github.com/google/googletest 2018-10-11 21:18:34 -04:00
misterg
589e55433e 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
400d3b1a5f Merge c41b2bf861 into f203b2db77
Closes #1899

PiperOrigin-RevId: 216719020
2018-10-11 13:31:25 -04:00
Gennadiy Civil
3bd8c37f38 Merge pull request #1902 from theryee/typo
Fix typo
2018-10-11 13:15:47 -04:00
David Neto
0f1f66c604 Merge 4c92120d6d into 658c6390a5
Closes #1893

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

PiperOrigin-RevId: 216709878
2018-10-11 12:44:07 -04:00
Abseil Team
697d8f386e Project import generated by Copybara.
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
82922524f4 Internal Change
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Filipp Andjelo
1ccfeccee9 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
Ryan Yee
6488079dfe Merge branch 'master' into typo 2018-10-11 01:22:25 -07:00
Ryan Yee
fee2e6cb2b fix typo 2018-10-11 01:13:09 -07:00
Gennadiy Civil
8f21765766 Merge pull request #1898 from spartucus/master
Update .gitignore
2018-10-10 15:28:58 -04:00
Tengfei Niu
79e7eddbec Update .gitignore
ignore .DS_Store on macOS.
2018-10-10 11:53:37 +08:00
Jerry Turcios
27e851fa30 Merge branch 'master' of https://github.com/google/googletest 2018-10-09 20:47:38 -04:00
misterg
b208478537 Remove non-variadic pre C++11 AnyOf
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04:00
Abseil Team
dd4e36663c 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
misterg
0a82a5a5ab Remove testing::internal::BothOfMatcher, no longer needed
PiperOrigin-RevId: 216389313
2018-10-09 16:25:51 -04:00
Abseil Team
443e603c40 Apply [[noreturn]] to Abort()
PiperOrigin-RevId: 216383938
2018-10-09 16:25:44 -04:00
Gennadiy Civil
0477c578ce Update Makefile.am
Remove references to gtest tupe
2018-10-09 15:47:46 -04:00
Gennadiy Civil
deffe7a278 Update BUILD.bazel
Remove references to googletest-tuple-test.cc
2018-10-09 15:42:49 -04:00
Gennadiy Civil
c6b2fbfcf8 Update README.md
Closes #587
2018-10-09 11:45:47 -04:00
Gennadiy Civil
69c420f12f test, please ignore 2018-10-09 11:34:09 -04:00
Gennadiy Civil
6e0394c346 Delete CHANGES
We are not maintaining change log, it has not been touched for a long time
2018-10-09 11:16:06 -04:00
Gennadiy Civil
072f55b9f9 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
Jerry Turcios
dc52af97e9 Merge branch 'master' of https://github.com/google/googletest 2018-10-08 19:25:16 -04:00
Eisoku Kuroiwa
cb23df8eb3 Merge c117088103 into 27c86f2941
Closes #1888

PiperOrigin-RevId: 216244924
2018-10-08 17:07:13 -04:00
misterg
f4fea9ea8c Fixing AllOfMatches test, where it properly belongs
PiperOrigin-RevId: 216193701
2018-10-08 17:07:05 -04:00
misterg
9e5ddcbeee always define define GTEST_LANG_CXX11 1
PiperOrigin-RevId: 216184859
2018-10-08 10:51:12 -04:00
misterg
a48e4d2375 Remove non-variadic pre C++11 AllOf
PiperOrigin-RevId: 216183352
2018-10-08 10:51:03 -04:00
Jerry Turcios
b1aff7416d Merge branch 'master' of https://github.com/google/googletest 2018-10-07 23:09:07 -04:00
Gennadiy Civil
4302d07cde Merge branch 'master' into python3-tests 2018-10-05 16:23:55 -04:00
Gennadiy Civil
29a9246fae Update primer.md
fixes #1709
2018-10-05 16:23:08 -04:00
misterg
e8ba6d4259 Remove pre-C++11 code from gtest-printers
PiperOrigin-RevId: 215941759
2018-10-05 15:17:01 -04:00
Abseil Team
9a2da8daa6 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
6af00517b5 Removed pre-C++11 IsContainerTest and IteratorTraits
PiperOrigin-RevId: 215916605
2018-10-05 12:54:21 -04:00
Abseil Team
7a6bc673ea 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
Jerry Turcios
559d4a6de7 Merge branch 'master' of https://github.com/google/googletest 2018-10-04 18:31:27 -04:00
misterg
c660240ad0 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
dd84af1f65 Merge branch 'master' into python3-tests 2018-10-04 15:08:14 -04:00
Jerry Turcios
f80cef3a3f Merge branch 'master' of https://github.com/google/googletest 2018-10-04 07:41:43 -04:00
1camper
fcd75b1113 Merge d830440d48 into f5260ae757
Closes #1830

PiperOrigin-RevId: 215563532
2018-10-03 16:11:12 -04:00
Jerry Turcios
561f50e831 Remove compilation option for C++11 in the root CMakeLists.txt 2018-10-02 23:43:01 -04:00
Jerry Turcios
1d53c045b3 Resolve code changes from origin repository 2018-10-02 22:12:06 -04:00