2554 Commits

Author SHA1 Message Date
kakkoko
baf6845b18 Fix incorrect XML file name in help message 2018-10-17 10:09:09 +09:00
Jonathan Wendeborn
0cefda7749
Removed last reference to internal::kDefault 2018-10-16 08:51:33 +02:00
Jonathan Wendeborn
96d1615772
Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice 2018-10-16 08:38:34 +02:00
BrukerJWD
8c82ba48e4
Merge branch 'master' into isnice 2018-10-16 08:37:56 +02:00
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 c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77161fe54846ea9e839ebec81aeeccac
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 4c92120d6dedb4eeb499a8702faea0224e0a8b23 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a
Closes #1893

PiperOrigin-RevId: 216712426
2018-10-11 12:52:55 -04:00
Aaron Dierking
e7327c13f6 Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5b363f46c6ad448ad1bce9d6e97e53a
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
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 c1170881039e859738c62b02a918116fc6d346bc into 27c86f29417e53a622a2902baab2d1d82dafc5f9
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 d830440d48a9502161448bc78be33a53388dd1f4 into f5260ae757a681566d8f7d0558b8dc0551036506
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
Matthieu
f5260ae757 Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into e93da23920e5b6887d6a6a291c3a59f83f5b579e
Closes #1836

PiperOrigin-RevId: 215461025
2018-10-02 17:41:16 -04:00
Jerry Turcios
1e893191c0 Add compilation option for C++11 in the root CMakeLists.txt 2018-10-02 15:11:11 -04:00
Gennadiy Civil
e93da23920 Merge 68b8a4c60cd80c78e1875b77807fa13cdd2313f8 into 77962730563eece3525f40b8769e4ca0c6baf64c
Closes #1880

PiperOrigin-RevId: 215429534
2018-10-02 14:52:38 -04:00
Marco Bubke
7796273056 Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into 440527a61e1c91188195f7de212c63c77e8f0a45
Closes #1867

PiperOrigin-RevId: 215392714
2018-10-02 13:03:35 -04:00
Arseny Aprelev
00938b2b22 Merge 2ce0685f76a4db403b7b2650433a584c150f2108 into 75e834700d19aa373b428c7c746f951737354c28
Closes #1544
With refinements and changes

PiperOrigin-RevId: 215273083
2018-10-02 13:03:28 -04:00
Gennadiy Civil
2e91bbcf6f
Merge pull request #1875 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export
2018-10-01 14:53:59 -04:00
misterg
a7b21c950d Googletest export
Internal Change

PiperOrigin-RevId: 215236414
2018-10-01 14:31:07 -04:00
durandal
be429c8924 Googletest export
Add myself to the authors table.

PiperOrigin-RevId: 214822035
2018-10-01 14:30:53 -04:00
Gennadiy Civil
6316d89433
Merge pull request #1872 from jerryturcios08/master
Add C++11 standard in the root CMakeLists.txt
2018-10-01 11:38:26 -04:00
Jerry Turcios
cba3474435 Add a cached variable to CMAKE_CXX_STANDARD 2018-09-30 12:27:05 -04:00
Jerry Turcios
d97dea39b9 Add C++11 support in the root CMakeLists.txt 2018-09-28 14:55:43 -04:00
Gennadiy Civil
440527a61e
Update appveyor.yml
Since we only one one MinGW left, lets enable it on PRs
2018-09-26 21:52:12 -07:00
Gennadiy Civil
907ae9edad
Merge branch 'master' into python3-tests 2018-09-25 22:09:27 -07:00
Gennadiy Civil
75e834700d
Merge pull request #1864 from google/revert-1853-appveyor-mingw-enable-tests-again
Revert "[mingw] enable the unittests for gmock and gtest again"
2018-09-25 22:06:05 -07:00
Gennadiy Civil
c2a2f49a3d
Revert "[mingw] enable the unittests for gmock and gtest again" 2018-09-25 21:58:40 -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
Gennadiy Civil
a6b5c58ec8
Merge pull request #1853 from matlo607/appveyor-mingw-enable-tests-again
[mingw] enable the unittests for gmock and gtest again
2018-09-25 21:44:13 -07:00
Gennadiy Civil
9241466921
Merge branch 'master' into appveyor-mingw-enable-tests-again 2018-09-25 21:29:51 -07:00
Gennadiy Civil
0809c68040
Merge pull request #1862 from google/9A681768AABE08D1EFA5CA77528236A4
Googletest export (and revert #1850)
2018-09-25 21:29:20 -07:00
Gennadiy Civil
220e790a96
Keep one MinGW build, remove the others 2018-09-25 20:57:46 -07:00
Gennadiy Civil
77301d64c8
Update appveyor.yml 2018-09-25 20:53:57 -07:00
Gennadiy Civil
8286bf2233
Update appveyor.yml 2018-09-25 20:49:16 -07:00
Gennadiy Civil
24ba1b1b3e
Delete m4_ax_cxx_compile_stdcxx_11.m4 2018-09-25 20:32:54 -07:00
Gennadiy Civil
239d2691b4
Delete m4_ax_cxx_compile_stdcxx.m4 2018-09-25 20:32:37 -07:00
Gennadiy Civil
12b97f3783
Update configure.ac 2018-09-25 20:32:11 -07:00
Gennadiy Civil
993f6d8960
Update Makefile.am 2018-09-25 20:31:31 -07:00
Gennadiy Civil
adcb1f8e8e
Update .travis.yml 2018-09-25 20:23:25 -07:00
Gennadiy Civil
5b6e40f46d automake 2018-09-25 23:16:10 -04:00
Gennadiy Civil
41b16d28d6 test automake c++11 2018-09-25 23:07:54 -04:00
Gennadiy Civil
df2a8dbc6d
Update configure.ac 2018-09-25 16:35:47 -07:00
Gennadiy Civil
5a4e2b1580
Update configure.ac 2018-09-25 16:29:31 -07:00
Gennadiy Civil
2ec9923ccb typo 2018-09-25 15:58:43 -04:00
Gennadiy Civil
c159a7719c autotools c++11 2018-09-25 15:54:29 -04:00
Gennadiy Civil
e2f45b1bb8 autotools c++11 2018-09-25 15:45:52 -04:00
Gennadiy Civil
f60de198af test 2018-09-25 15:31:01 -04:00
Gennadiy Civil
ecbcd99c4f include c++11 for autotools 2018-09-25 14:22:11 -04:00
Gennadiy Civil
70de02bf2c
Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4 2018-09-25 11:08:43 -07:00
Gennadiy Civil
70ed5e5c45
Merge pull request #1863 from google/revert-1857-master
Revert "Add clang format check to one of the builds"
2018-09-25 11:08:29 -07:00
Abseil Team
2b016ca493 Googletest export
Project import generated by Copybara.

PiperOrigin-RevId: 214456152
2018-09-25 13:05:37 -04:00
Gennadiy Civil
c34ecf1ff0
Revert "Add clang format check to one of the builds" 2018-09-25 10:05:30 -07:00
misterg
b2788286d1 Googletest export
Project import generated by Copybara.

PiperOrigin-RevId: 214441835
2018-09-25 13:05:25 -04:00
misterg
ba974c97ac Googletest export
Remove non-variadic pre C++11 ElementsAreMatcher and UnorderedElementsAreMatcher

PiperOrigin-RevId: 214266944
2018-09-25 13:05:17 -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
0f7f5cd93a
Merge pull request #1861 from gennadiycivil/master
adding c++11 to appveyor mingW and autotools build
2018-09-25 09:59:22 -07:00
Gennadiy Civil
db6e8c727a enable MingW on PR 2018-09-25 12:32:52 -04:00
Gennadiy Civil
b91eab2fc7 C++11 autotools build 2018-09-25 12:24:34 -04:00
Gennadiy Civil
c26dd53ce2 adding c++11 to appveyor mingW 2018-09-25 12:20:01 -04:00