eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
976 Commits 13 Branches 14 Tags 23 MiB
518e0519ca
Commit Graph

976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Kegel
518e0519ca 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
Billy Donahue
aa148eb2b7 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
ba638689e4 Remove /tree/ from Readme.md links. 
Issue #1028
 2017-02-25 20:46:21 -05:00
Billy Donahue
51143d5b62 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
srz_zumix
9655b9f53d fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/ 2017-02-03 08:05:22 +09:00
Billy Donahue
d62d6c6556 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
9ae086a9eb 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
3134af23d7 Merge pull request #1 from google/master 
Syncing my branch
 2017-01-23 13:49:32 -05:00
Mike Bjorge
06a81e9357 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
Billy Donahue
5e7fd50e17 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
c0059a79f8 2.6.4 is the minimum CMake version, so enforce it (#656) 2016-12-17 19:15:04 -05:00
Craig Scott
cb502b7ad1 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
Billy Donahue
a2b8a8e076 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
Billy Donahue
3447fc31b4 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
4eafafbde5 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
Billy Donahue
ecd530865c 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
8ce0b5907c Cookbok: fix broken relative link 2016-09-13 20:53:41 +02:00
Samuel Roth
32b4a9b390 Fixed broken links 2016-09-12 12:34:50 -04:00
Samuel Roth
0e0ff5c341 blob vs tree 2016-09-12 12:33:44 -04:00
Samuel Roth
960a511f45 Fixing relative links 2016-09-12 12:31:50 -04:00
Samuel Roth
995db996de Fixing KnownIssues and FrequentlyAskedQuestions links 2016-09-12 12:27:36 -04:00
Samuel Roth
f5c0130e88 Broken relative links fixed 2016-09-12 12:24:08 -04:00
Samuel Roth
9cb03aa702 Fixing ForDummies link 2016-09-12 12:19:26 -04:00
Samuel Roth
51b290d41e One works 2016-09-12 12:15:49 -04:00
Samuel Roth
16d6af7d41 Relative links 2016-09-12 12:14:53 -04:00
Samuel Roth
10ff7f9468 Fixing relative links 2016-09-12 12:14:00 -04:00
Billy Donahue
48ee8e98ab Merge pull request #856 from KindDragon/mingw-appveyor 
Fix Mingw-w64 build
 2016-09-07 14:48:12 -04:00
Arkadiy Shapkin
d8fe70f477 Fix build with MinGW-w64 2016-09-05 00:57:49 +03:00
Billy Donahue
ed9d1e1ff9 Merge pull request #721 from ilmagico/fix-mingw-threads 
Fix compilation of googletest with MinGW using Win32 threads
 2016-08-24 08:15:38 -04:00
Billy Donahue
ec44c6c167 Merge pull request #821 from mazong1123/master 
Fixed issue #775. Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
 2016-07-14 13:15:38 -04:00
mazong1123
dc2dbf1fbf Reformatted the Unprintable operator== code style. 2016-07-14 16:49:42 +08:00
mazong1123
531bf5c410 Fixed issue #775 2016-07-14 14:09:05 +08:00
Billy Donahue
d406cb18c3 Merge pull request #814 from google/BillyDonahue-patch-2 
Add Appveyor badge to Readme.md
 2016-06-28 22:27:12 -04:00
Billy Donahue
e51026e5d1 Add Appveyor badge to Readme.md 2016-06-28 22:26:30 -04:00
Billy Donahue
8134585072 Merge pull request #723 from KindDragon/master 
Run MSVC tests on AppVeyor
 2016-06-28 10:47:48 -04:00
Arkadiy Shapkin
43c0ae3375 Support running MSVC build on AppVeyour 2016-06-27 11:40:27 +03:00
Billy Donahue
10799abad2 Merge pull request #810 from google/rollback_808 
Rollback change #808.
 2016-06-26 19:09:45 -04:00
Billy Donahue
ce7ec96eda Rollback change #808. 2016-06-26 18:33:10 -04:00
Billy Donahue
faee7d1fbc Merge pull request #808 from djmott/master 
fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th…
 2016-06-26 11:15:54 -04:00
David Mott
2489c30747 Fix to tests that return object which implement operator bool 2016-06-25 16:21:09 -05:00
David Mott
e35015f539 fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that implement operator bool 2016-06-25 15:41:19 -05:00
Billy Donahue
0a439623f7 Merge pull request #773 from mazong1123/master 
Fixed googletest dir issue for building googlemock.
 2016-05-15 12:20:57 -04:00
mazong1123
5bae126d66 Added VS 2015 project support. 2016-05-15 21:46:38 +08:00
mazong1123
01f3d09f9f Updated the value of GTEST_DIR to reflect the googletest dir. 2016-05-15 21:32:56 +08:00
mazong1123
2746b57f78 Changed the GTestDir marco value to reflect the new dir of googletest. 2016-05-15 20:48:08 +08:00
Billy Donahue
d225acc90b Merge pull request #741 from mbinna/patch-1 
Fix whitespace in paragraph
 2016-03-16 09:12:54 -04:00
Manuel Binna
207147495c Fix whitespace in paragraph 2016-03-16 06:49:57 +01:00
Billy Donahue
72416fab75 Merge pull request #724 from duggelz/master 
Read Bazel's $XML_OUTPUT_FILE environment variable
 2016-03-15 18:20:27 -04:00
Billy Donahue
eba1796310 Merge pull request #735 from phad/patch-1 
Fix typo (Inovke -> Invoke)
 2016-03-08 10:52:28 -05:00
Paul Hadfield
0098be394a Fix typo (Inovke -> Invoke) 2016-03-08 13:40:26 +00:00