Commit Graph

2801 Commits

Author SHA1 Message Date
Jonathan Wendeborn
386391b014
Use existing Mock::GetReactionOnUninterestingCalls() 2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
6bbf911a8d
Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
67a240a107
Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Jerry Turcios
9424e7b0d2 Merge branch 'master' of https://github.com/google/googletest 2018-10-12 19:02:15 -04:00
Gennadiy Civil
a651a4d44e Merge pull request #1908 from rwoldberg:master
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
dec3b81a08 Change types to remove cast warnings. 2018-10-12 11:12:55 -06:00
Gennadiy Civil
754cb8ed96
Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-12 12:44:33 -04:00
Jerry Turcios
8fad86e757 Merge branch 'master' of https://github.com/google/googletest 2018-10-11 21:18:34 -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 c41b2bf861 into f203b2db77
Closes #1899

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

PiperOrigin-RevId: 216712426
2018-10-11 12:52:55 -04:00
Aaron Dierking
e7327c13f6 Merge 41fc9745d4 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
Ryan Yee
4d50ab75a7
Merge branch 'master' into typo 2018-10-11 01:22:25 -07:00
Ryan Yee
a83429f5d3 fix typo 2018-10-11 01:13:09 -07:00
Gennadiy Civil
658c6390a5
Merge pull request #1898 from spartucus/master
Update .gitignore
2018-10-10 15:28:58 -04:00
Tengfei Niu
8193ed069c
Update .gitignore
ignore .DS_Store on macOS.
2018-10-10 11:53:37 +08:00
Jerry Turcios
274b39bfa0 Merge branch 'master' of https://github.com/google/googletest 2018-10-09 20:47:38 -04:00
misterg
78761b58fc Remove non-variadic pre C++11 AnyOf
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04: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
misterg
5434989dbd Remove testing::internal::BothOfMatcher, no longer needed
PiperOrigin-RevId: 216389313
2018-10-09 16:25:51 -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
5ae4f62225
Update README.md
Closes #587
2018-10-09 11:45:47 -04:00
Gennadiy Civil
4665eee10a test, please ignore 2018-10-09 11:34:09 -04:00
Gennadiy Civil
272c08380a
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
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
Jerry Turcios
a113467a4e Merge branch 'master' of https://github.com/google/googletest 2018-10-08 19:25:16 -04:00
Eisoku Kuroiwa
a31d6f9057 Merge c117088103 into 27c86f2941
Closes #1888

PiperOrigin-RevId: 216244924
2018-10-08 17:07:13 -04:00
misterg
4ac07de8de Fixing AllOfMatches test, where it properly belongs
PiperOrigin-RevId: 216193701
2018-10-08 17:07:05 -04:00
misterg
27c86f2941 always define define GTEST_LANG_CXX11 1
PiperOrigin-RevId: 216184859
2018-10-08 10:51:12 -04:00
misterg
fab35920ad Remove non-variadic pre C++11 AllOf
PiperOrigin-RevId: 216183352
2018-10-08 10:51:03 -04:00
Jerry Turcios
4327d95b3e Merge branch 'master' of https://github.com/google/googletest 2018-10-07 23:09:07 -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
Jerry Turcios
7caf5ffd1d Merge branch 'master' of https://github.com/google/googletest 2018-10-04 18:31:27 -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
Jerry Turcios
50ec6ee33c Merge branch 'master' of https://github.com/google/googletest 2018-10-04 07:41:43 -04:00
1camper
bea3d61975 Merge d830440d48 into f5260ae757
Closes #1830

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