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

968 Commits

Author SHA1 Message Date
Sam Roth
b8cfea1b58 Merge pull request from google/master 
Syncing my branch
 2017-01-23 13:49:32 -05:00
Billy Donahue
17a1f78f86 Merge pull request 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 () 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
Billy Donahue
824055a10e Merge pull request 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
2def6d9054 Merge pull request 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
Billy Donahue
d12a26a19d Merge pull request 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 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
Billy Donahue
58ec2e3ded Merge pull request from ilmagico/fix-mingw-threads 
Fix compilation of googletest with MinGW using Win32 threads
 2016-08-24 08:15:38 -04:00
Billy Donahue
b28bef5068 Merge pull request from mazong1123/master 
Fixed issue . Mark the ConvertibleFromAny constructor as explicit, and fix operator overload issue for Unprintable
 2016-07-14 13:15:38 -04:00
mazong1123
a51867e59b Reformatted the Unprintable operator== code style. 2016-07-14 16:49:42 +08:00
mazong1123
0b7987a646 Fixed issue 2016-07-14 14:09:05 +08:00
Billy Donahue
8397a62185 Merge pull request from google/BillyDonahue-patch-2 
Add Appveyor badge to Readme.md
 2016-06-28 22:27:12 -04:00
Billy Donahue
ee075efa6b Add Appveyor badge to Readme.md 2016-06-28 22:26:30 -04:00
Billy Donahue
a7e3900676 Merge pull request from KindDragon/master 
Run MSVC tests on AppVeyor
 2016-06-28 10:47:48 -04:00
Arkadiy Shapkin
f8269a99a8 Support running MSVC build on AppVeyour 2016-06-27 11:40:27 +03:00
Billy Donahue
4e940e23a4 Merge pull request from google/rollback_808 
Rollback change .
 2016-06-26 19:09:45 -04:00
Billy Donahue
34b7cd3bf6 Rollback change . 2016-06-26 18:33:10 -04:00
Billy Donahue
8d6a2eec1a Merge pull request from djmott/master 
fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions th…
 2016-06-26 11:15:54 -04:00
David Mott
b45748d0ab Fix to tests that return object which implement operator bool 2016-06-25 16:21:09 -05:00
David Mott
a8a1a0e041 fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that implement operator bool 2016-06-25 15:41:19 -05:00
Billy Donahue
15b52cec0d Merge pull request from mazong1123/master 
Fixed googletest dir issue for building googlemock.
 2016-05-15 12:20:57 -04:00
mazong1123
3a8bc32b84 Added VS 2015 project support. 2016-05-15 21:46:38 +08:00
mazong1123
af72674db0 Updated the value of GTEST_DIR to reflect the googletest dir. 2016-05-15 21:32:56 +08:00
mazong1123
45ee7b0c46 Changed the GTestDir marco value to reflect the new dir of googletest. 2016-05-15 20:48:08 +08:00
Billy Donahue
ac04238b22 Merge pull request from mbinna/patch-1 
Fix whitespace in paragraph
 2016-03-16 09:12:54 -04:00
Manuel Binna
71f7537bbc Fix whitespace in paragraph 2016-03-16 06:49:57 +01:00
Billy Donahue
f623d9b896 Merge pull request from duggelz/master 
Read Bazel's $XML_OUTPUT_FILE environment variable
 2016-03-15 18:20:27 -04:00
Billy Donahue
8fab1d0783 Merge pull request from phad/patch-1 
Fix typo (Inovke -> Invoke)
 2016-03-08 10:52:28 -05:00
Paul Hadfield
8c79120e0e Fix typo (Inovke -> Invoke) 2016-03-08 13:40:26 +00:00
Billy Donahue
3958674f72 Merge pull request from mattrajca/patch-1 
Fixed typo ('XCode' -> 'Xcode')
 2016-03-05 17:09:33 -05:00
Matt Rajca
553b8ea918 Fixed typo ('XCode' -> 'Xcode') 2016-03-04 17:20:34 -06:00
Dan Albert
3cf0535158 Fix a test to compile when tuple isn't available. 2016-03-02 15:51:28 -08:00
Doug Greiman
92ca583f01 Restructure test so each scenario is independent. 2016-03-02 12:07:42 -08:00
Doug Greiman
31bdab0dad Fix env_var_test to ignore XML_OUTPUT_FILE if already set 2016-03-01 17:44:02 -08:00
Doug Greiman
9c99ed9211 Restructure $XML_OUTPUT_FILE logic 2016-02-26 14:26:23 -08:00
Doug Greiman
1862e3a14e Fix inconsistent style 2016-02-25 19:03:46 -08:00
Doug Greiman
3ac6a7bdd8 Read Bazel's $XML_OUTPUT_FILE environment variable 
If $XML_OUTPUT_FILE is set, and $GTEST_OUTPUT and --gtest_output are not
specified, produce output as if GTEST_OUTPUT=xml:$XML_OUTPUT_FILE had
been set.
 2016-02-23 18:50:08 -08:00