Commit Graph

1309 Commits

Author SHA1 Message Date
Claus Stovgaard
823ebf48d2 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 2017-04-05 10:18:07 +02:00
danilcha
d98857c634 Again rewrote everything 2017-03-12 18:11:22 +01:00
danilcha
d36aeb6195 Added explicit gtest library dependency 2017-03-12 17:47:14 +01:00
danilcha
b6bdad37de Update README.md 2017-03-11 01:06:58 +01:00
danilcha
3d7d863798 Update README.md 2017-03-11 01:02:21 +01:00
Dan Kegel
1f92ec6cfd Minimal changes to fix build failures on Microsoft Visual Studio 2015
Fixes the following errors:

hash_map(17): error C2338: <hash_map> is deprecated and will be REMOVED. Please use <unordered_map>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj]
hash_set(17): error C2338: <hash_set> is deprecated and will be REMOVED. Please use <unordered_set>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj]
googletest\test\gtest_catch_exceptions_test_.cc(152): error C2220: warning treated as error - no 'object' file generated
googletest\test\gtest_catch_exceptions_test_.cc(152): warning C4297: 'CxxExceptionInDestructorTest::~CxxExceptionInDestructorTest': function assumed not to throw an exception but does
  googletest\test\gtest_catch_exceptions_test_.cc(152): note: destructor or deallocator has a (possibly implicit) non-throwing exception specification

There were already some checks for _MSC_VER in the code, so this commit
continues in that vein.
2017-03-01 18:40:48 -08:00
vpfautz
82ed7f8716 Fixed some typos 2017-02-26 19:15:33 +01:00
Billy Donahue
575214e286 Merge pull request #1029 from google/BillyDonahue-patch-3
Remove /tree/ from Readme.md links.
2017-02-25 20:47:57 -05:00
Billy Donahue
dc024dff2a Remove /tree/ from Readme.md links.
Issue #1028
2017-02-25 20:46:21 -05:00
Billy Donahue
72774933bf Merge pull request #996 from srz-zumix/fix-error
fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/
2017-02-17 10:50:24 -05:00
Olivier Clavel
40531016b8 googlemock version must be changed as well
keep googletest and googlemock versions in sync
2017-02-13 22:15:22 +01:00
Olivier Clavel
cf2860ebdc Wrong version reported (1.7.0 should be 1.8.0)
`gtest-config --version` reports wrong version.

Made against master branch but please note that this affects tag release-1.8.0 and the distribution tarballs.
2017-02-13 14:59:00 +01:00
Dawid Kurek
c16ad8ce5d Replace html entities with their equivalents 2017-02-06 13:31:11 +01:00
srz_zumix
beedbbea89 fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/ 2017-02-03 08:05:22 +09:00
Billy Donahue
505b9cf9c4 Merge pull request #982 from mbjorge/unused-variable-fix
Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
2017-01-31 17:09:47 -05:00
Billy Donahue
4795be81ab Merge pull request #874 from sejr/master
Fixing broken relative links in Google Mock documentation
2017-01-23 16:13:43 -05:00
Sam Roth
b8cfea1b58 Merge pull request #1 from google/master
Syncing my branch
2017-01-23 13:49:32 -05:00
Mike Bjorge
8b6e202629 Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_P
If REGISTER_TYPED_TEST_CASE_P is included in a header file, but
the .cc file does not declare INSTANTIATE_TYPED_TEST_CASE_P, an
unused-variable warning may be raised by the compiler.
2017-01-09 16:02:55 -08:00
nicolacavallini
51c788bd26 added link to sample 6 in the documentation of typed test 2016-12-23 11:45:08 +01:00
David Benjamin
6d9c745ca4 Annotate ColoredPrintf with the format attribute and fix bugs.
googletest doesn't currently build with clang's very aggressive
-Wformat-nonliteral warning. It requires that all non-literal format
strings come from the argument of a function annotated with a compatible
format attribute.

Fixing that reports that ColoredPrintf's callers weren't passing the
normal -Wformat warning. Some messages were passed directly into the
format string rather than via "%s".
2016-12-21 20:57:21 -05:00
Billy Donahue
17a1f78f86 Merge pull request #658 from audiofanatic/ExternalProject_at_configure_time
Added docs for ExternalProject download during CMake step
2016-12-18 11:59:12 -05:00
Craig Scott
5fc61b8c25 2.6.4 is the minimum CMake version, so enforce it (#656) 2016-12-17 19:15:04 -05:00
Craig Scott
a0a7489cd4 Added CMake configure-time download instructions to docs
Adds instructions for how to add gtest and gmock to
another CMake project directly. Downloading of the
googletest sources happens as configure time, allowing
it to be added to the main build directly via the
add_subdirectory() command. This ensures googletest is
built with the same compiler settings, etc. and will
typically result in a more robust and more convenient
build arrangement.
2016-12-18 09:01:27 +11:00
Alexey Klimkin
75142aeeca Fix a typo
Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
2016-12-12 16:38:14 -08:00
Simon Glass
7dd052bd8f Fix a few documentation nits in the mock dummies guide
Add a hyphen to 'ad hoc' and change 'distance' to plural.
2016-12-08 10:57:46 -05:00
srz_zumix
5d3798f782 Fix or condition typo ( '|' -> '||' ) 2016-11-11 12:21:56 +09:00
bartshappee
bed9a44281 Fix small typo SeArrayArgument
SeArrayArgument => SetArrayArgument
2016-11-07 13:33:22 -05:00
Edgar Riba
88c1c2c080 update README.md with tiny-dnn
tiny-dnn in its recent version updated the testing framework to GTest.
We would like to be mentioned as consumers of the project.
2016-11-05 19:58:53 +01:00
Billy Donahue
824055a10e Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONE
Fix detection of GTEST_HAS_CLONE for Android.
2016-11-03 16:36:28 -04:00
Jérémie Delaitre
31a7b878fd Fix the link to the float comparison article
As explained on the previous link, the article has been rewritten and moved.
2016-11-03 11:38:41 +13:00
Billy Donahue
2def6d9054 Merge pull request #728 from DanAlbert/tuple-stlport
Fix a test to compile when tuple isn't available.
2016-11-02 13:54:19 -04:00
Dan Albert
cd955dc313 Fix detection of GTEST_HAS_CLONE for Android.
This was not in Gingerbread for anything but ARM (even though the
libs were hacked to lie about it being available in gingerbread).
2016-11-01 06:37:49 -07:00
Ross Wang
2e8062bd72 Update Primer.md
Correcting typo: "text fixture" => "test fixture"
2016-10-18 13:56:03 -07:00
iignatev
38b2f11416 enable null detection on Solaris Studio 12u4+ 2016-10-17 20:49:59 +03:00
Gallaecio
5b0fee3f65 Fix WhenSorted() documentation example 2016-10-08 22:17:31 +02:00
Billy Donahue
d12a26a19d Merge pull request #876 from marco-m/patch-1
mock cookbook: fix broken relative link
2016-09-21 16:22:52 -04:00
Marco Molteni
b3f7f89f40 Cookbok: fix broken relative link 2016-09-13 20:53:41 +02:00
Samuel Roth
788443fd63 Fixed broken links 2016-09-12 12:34:50 -04:00
Samuel Roth
416ec6c6a3 blob vs tree 2016-09-12 12:33:44 -04:00
Samuel Roth
b4b16c92a4 Fixing relative links 2016-09-12 12:31:50 -04:00
Samuel Roth
9c3be37cc6 Fixing KnownIssues and FrequentlyAskedQuestions links 2016-09-12 12:27:36 -04:00
Samuel Roth
682cd77fe1 Broken relative links fixed 2016-09-12 12:24:08 -04:00
Samuel Roth
12e027bd4b Fixing ForDummies link 2016-09-12 12:19:26 -04:00
Samuel Roth
d33171dba7 One works 2016-09-12 12:15:49 -04:00
Samuel Roth
5b59ec63a9 Relative links 2016-09-12 12:14:53 -04:00
Samuel Roth
4701a32c6a Fixing relative links 2016-09-12 12:14:00 -04:00
Billy Donahue
5a78639dd2 Merge pull request #856 from KindDragon/mingw-appveyor
Fix Mingw-w64 build
2016-09-07 14:48:12 -04:00
Arkadiy Shapkin
76fad07f80 Fix build with MinGW-w64 2016-09-05 00:57:49 +03:00
Marzo Sette Torres Junior
9907f86068 Clarifying language
The old language might mislead someone into thinking that the access level on the base class itself was changed.
2016-09-02 14:39:48 -03:00
tommyleo2
779d72f558 Update Primer.md
fix bug in string comparison assertions table where _str2_ is mistakenly written as _str_2
2016-09-02 19:45:48 +08:00