3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-09 21:57:40 +08:00
Code Issues Projects Releases Wiki Activity
1,433 Commits 7 Branches 27 Tags 38 MiB
Commit Graph

1433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
7f8fefabed Merge pull request #1237 from sgraham/update-docs-3 
Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA, plus small documentation change
 2017-08-30 17:29:43 -04:00
Herbert Thielen
cfcc89a84a Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-30 21:46:30 +02:00
Gennadiy Civil
fa70b84ab5 Removed "Trivial" 
Who knows? may not be very trivial given the code drift between internal and OSS
 2017-08-30 14:51:36 -04:00
Gennadiy Civil
c4e01616af removed internal link ( not allowed in OSS) 2017-08-30 14:50:40 -04:00
Scott Graham
0eb49f4d6b Note that it is preferable for Googlers to create a CL internally first 2017-08-30 11:29:06 -07:00
Gennadiy Civil
bb1c4af487 Merge branch 'master' into master 2017-08-30 14:11:38 -04:00
Herbert Thielen
9ba7946bde create different python based tests for single and multi configuration build generators 2017-08-30 19:17:26 +02:00
Gennadiy Civil
c4ec2ac04d Merge branch 'master' into hethi/travis-unused-cmake 2017-08-30 11:49:23 -04:00
Gennadiy Civil
4db9a748e3 Merge branch 'master' into hethi/unused-import 2017-08-30 11:47:32 -04:00
Herbert Thielen
47ad2993b6 Revert "ask cmake for per-configuration output subdir" 
This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e.

Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
 2017-08-30 15:14:34 +02:00
Gennadiy Civil
5d431c650f Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide 
fix SetUp/TearDownTestCase() in AdvancedGuide
 2017-08-30 08:47:10 -04:00
Herbert Thielen
73d58dd4c8 ask cmake for per-configuration output subdir 
On single-configuration build systems as Makefile Generators, there is
no subdirectory for the configuration in the build tree - therefore ask
cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on
single-configuration build systems (Linux et al.).
 2017-08-30 12:59:06 +02:00
Herbert Thielen
7529c8aa05 remove obsolete comment regarding python tests on linux 2017-08-30 12:48:28 +02:00
Herbert Thielen
f0c72bfe09 fix SetUp/TearDownTestCase() in AdvancedGuide 
fixes issue #1087
 2017-08-30 12:19:59 +02:00
Herbert Thielen
dae044d4b9 use upper-case build type 
While cmake does not complain on build type 'debug', the cmake
documentation always spells it 'Debug', so take this.
 2017-08-30 12:00:24 +02:00
Herbert Thielen
cc246ecb56 use build type set in .travis.yml 
The BUILD_TYPE variable of .travis.yml was ignored up to now.
 2017-08-30 11:59:36 +02:00
Herbert Thielen
d6562b5a57 Merge branch 'master' into hethi/unused-import 2017-08-30 10:44:26 +02:00
Herbert Thielen
c780e0e2c4 Merge branch 'master' into hethi/travis-unused-cmake 2017-08-30 10:43:54 +02:00
Gennadiy Civil
71e2858f32 Merge pull request #1226 from aninf-wo/hethi/fix-typo 
fix typo in comment and string (SetUpTestCase)
 2017-08-30 00:33:30 -04:00
Gennadiy Civil
5bd8e83217 Merge branch 'master' into hethi/fix-typo 2017-08-29 23:59:32 -04:00
Gennadiy Civil
298cd5e9c4 Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105 
fix typos mentioned in issue 1105
 2017-08-29 19:31:16 -04:00
Gennadiy Civil
b46755be30 Merge pull request #1229 from aninf-wo/hethi/typo-xUnit 
fix typo: xUnit
 2017-08-29 19:30:38 -04:00
Gennadiy Civil
58fd184c7f Merge branch 'master' into hethi/typo-xUnit 2017-08-29 19:30:18 -04:00
Gennadiy Civil
c4126e0463 Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs 
reduce travis buildjobs by 4/12
 2017-08-29 19:27:27 -04:00
Gennadiy Civil
24ceb4f4f5 Merge pull request #1231 from aninf-wo/heth/travis-verbose-make 
switch on verbose make in travis builds
 2017-08-29 19:26:34 -04:00
Scott Graham
c3d1d33560 Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA 2017-08-29 12:45:26 -07:00
Herbert Thielen
bb8399e1ba use plural verb as mentioned in issue #1105 2017-08-29 21:20:46 +02:00
Herbert Thielen
29c07aa9db remove Yob's comma mentioned in issue #1105 2017-08-29 21:19:45 +02:00
Herbert Thielen
d33861dca6 run combined build only 
There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests.
 2017-08-29 17:41:26 +02:00
Herbert Thielen
4a45157589 switch on verbose make 2017-08-29 17:04:15 +02:00
Herbert Thielen
8364718500 remove non-existing gmock_build_samples switch 2017-08-29 16:35:41 +02:00
Gennadiy Civil
30c1e00afb Merge branch 'master' into hethi/typo-xUnit 2017-08-29 10:19:33 -04:00
Gennadiy Civil
96f3745e73 Merge pull request #1189 from alyssawilk/flag-default 
Adding a flag option to change the default mock type
 2017-08-29 10:18:33 -04:00
Herbert Thielen
fe760e9c6d fix typo: xUnit 2017-08-29 15:27:54 +02:00
Herbert Thielen
b567aadd1b remove unused TestCase import 2017-08-29 14:27:10 +02:00
Herbert Thielen
daaed2b6cb fix typo in comment and string (SetUpTestCase) 2017-08-29 14:22:09 +02:00
Alyssa Wilk
fa5d3b3845 Applying lint checks from upstream google3 2017-08-28 16:13:41 -04:00
Alyssa Wilk
c00373320d Merge branch 'refs/heads/master' into flag-default 2017-08-28 16:10:12 -04:00
Brian Silverman
4d26df729c Speed up printing of characters which need hex escaping 
This change speeds up the runtime of a value-parameterized test I have
which has lots of values with large strings full of unprintable
characters by 2x. I profiled it and traced most of the slowness during
googletest startup down to the way String::FormatHexInt was creating and
destroyed a stringstream for each character in the string for each
value.
 2017-08-28 16:00:48 -04:00
Gennadiy Civil
b43bfcf491 Merge pull request #1222 from KindDragon/vs-projects-fix3 
Support x64 configuration for old VS2015 projects
 2017-08-25 10:31:12 -04:00
Gennadiy Civil
a7eeb6971f Merge branch 'master' into vs-projects-fix3 2017-08-24 22:53:22 -04:00
Gennadiy Civil
f25921565b Merge pull request #1221 from KindDragon/vs-projects-fix2 
Remove gtest VS2005 projects
 2017-08-24 22:53:00 -04:00
Arkady Shapkin
cb8ebf5c9a Support x64 configuration for old VS2015 projects 2017-08-25 01:58:00 +03:00
Arkady Shapkin
45287f3dff Remove gtest VS2005 projects 2017-08-25 01:57:35 +03:00
Gennadiy Civil
eabd5c908d Merge pull request #1186 from Dani-Hub/master 
Prevent infinite loops for recursive containers like boost::filesystem::path
 2017-08-24 10:50:17 -04:00
Gennadiy Civil
87327b12e9 Merge branch 'master' into master 2017-08-23 14:27:55 -04:00
Gennadiy Civil
c38baf9858 Merge pull request #1219 from KindDragon/vs-projects-fix 
Support x64 configuration for VS2010 projects
 2017-08-23 14:15:36 -04:00
Daniel Krügler
ebc7b01d89 Merge branch 'master' into master 2017-08-23 11:11:44 +02:00
Gennadiy Civil
79cdf971fb Merge branch 'master' into bazel 2017-08-22 23:20:53 -04:00
Gennadiy Civil
f4abce4609 Merge branch 'master' into vs-projects-fix 2017-08-22 22:38:22 -04:00
Gennadiy Civil
863e02644b Merge pull request #1220 from romkatv/property-matcher 
Support ref-qualified member functions in Property().
 2017-08-22 22:37:30 -04:00
Arkady Shapkin
88269cd365 Support x64 configuration for old VS2010 projects 
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
 2017-08-23 01:45:44 +03:00
drgler
f8514b8da3 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:41 +02:00
drgler
d93ce9d6fb Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:32 +02:00
drgler
fa3bb1a779 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:19:13 +02:00
drgler
6404d45a92 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:18:54 +02:00
Roman Perepelitsa
966b549c88 Support ref-qualified member functions in Property(). 2017-08-22 16:06:26 +02:00
Daniel Krügler
8304d06199 Merge branch 'master' into master 2017-08-21 20:14:09 +02:00
Gennadiy Civil
96f7ba83cb Merge branch 'master' into wrong-version-reported 2017-08-21 13:11:58 -04:00
Gennadiy Civil
675686a139 Merge pull request #1206 from ShadowIce/methodname-in-exception 
Add function name to exception if there's no default action
 2017-08-21 10:37:53 -04:00
Maurice Gilden
1ee8079651 Remove unused variable 2017-08-21 10:10:14 +02:00
Gennadiy Civil
3cf65b5d86 Added "explicit" as per compiler suggestion 2017-08-20 15:20:13 -04:00
Gennadiy Civil
026735daf3 Proposing these changes, please review 
Slightly better names and cleaner tests.
Please review
 2017-08-20 15:15:31 -04:00
Zhongming Qu
f52c95dae4 Merge branch 'master' into bazel 2017-08-18 22:22:00 -07:00
Gennadiy Civil
35737ac7ac Merge branch 'master' into methodname-in-exception 2017-08-18 16:26:02 -07:00
Gennadiy Civil
780bae0fac Merge pull request #1215 from henryiii/patch-1 
Adding CMake visibility policy setting
 2017-08-18 16:25:03 -07:00
Henry Schreiner
5518a1d350 Adding CMake visibility policy setting 
This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
 2017-08-18 15:18:58 -04:00
Maurice Gilden
b0ed43e724 Change tabs to spaces in test case 2017-08-18 15:27:02 +02:00
Zhongming Qu
99d0ef39a6 Also can build when included in source. 2017-08-18 04:00:02 -07:00
Zhongming Qu
9538687a89 Remove trailing whitespaces in BUILD.bazel 2017-08-18 03:59:53 -07:00
Maurice Gilden
36777251c0 Switch return type to class without default constructor 2017-08-18 12:28:50 +02:00
Maurice Gilden
cc99900036 Fix test if exceptions are not supported 2017-08-18 11:46:15 +02:00
Maurice Gilden
95f18d9938 adds test for NiceMock with unknown return value 2017-08-18 11:21:28 +02:00
Gennadiy Civil
1183503d11 Merge branch 'master' into methodname-in-exception 2017-08-17 09:08:37 -07:00
Gennadiy Civil
1fe692ce49 Update README.md 
Another AppVeyor move
 2017-08-16 23:42:53 -07:00
Gennadiy Civil
8f233a74eb Merge branch 'master' into methodname-in-exception 2017-08-16 15:27:29 -07:00
Gennadiy Civil
b7e8a993b4 Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install 
Fix problem installing gtest when gmock enabled
 2017-08-16 11:26:58 -07:00
Alyssa Wilk
a2803bc37d Handling invalid flag values 2017-08-16 12:43:26 -04:00
Maurice Gilden
5b4166f05f Add function name to exception if there's no default action 2017-08-16 17:53:16 +02:00
Matthew Woehlke
9469fb687d Fix problem installing gtest when gmock enabled 
Fix a bug deciding whether to enable the option to install Google Test
caused by one of the dependent option dependencies not being defined
yet.

Fixes #1198; impossible to install Google Test if Google Mock is built.
 2017-08-16 10:49:06 -04:00
Gennadiy Civil
5ed471caec Merge pull request #1204 from gennadiycivil/master 
Changing Build Status AppVeyor badge with AppVeyor ownership change
 2017-08-14 16:05:27 -07:00
Gennadiy Civil
08b1a1f73c Merge branch 'master' into master 2017-08-14 15:29:51 -07:00
misterg
3f3a3ada20 Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:22:03 -04:00
misterg
a4121dd54b Change AppVeyor Status Badge to point to new AppVeyor Project Location 2017-08-14 18:21:07 -04:00
gpetit
ca76206f42 Removed extra colon in error log 2017-08-14 15:30:01 -04:00
Gennadiy Civil
e0fc65c5fb Merge pull request #1197 from SoapGentoo/pkgconfig 
Add support for pkgconfig
 2017-08-14 14:33:41 -04:00
gpetit
0c3c811164 Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf 2017-08-14 13:45:45 -04:00
gpetit
8f04622cc1 Use GTEST_LOG instead of printf 2017-08-14 13:45:27 -04:00
David Seifert
9cacce4e5c Add documentation for pkg-config 2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac Add support for pkgconfig 2017-08-14 13:45:56 +02:00
Che-Hsun Liu
24696c3958 Merge branch 'master' into master 2017-08-14 14:51:49 +08:00
Gennadiy Civil
673c975a96 Merge pull request #905 from iignatev/master 
enable null detection on Solaris Studio 12u4+
 2017-08-13 21:34:10 -04:00
Gennadiy Civil
9816b96a6d Merge pull request #857 from KindDragon/patch-1 
Add links to IRC channel and Google Group
 2017-08-11 11:29:50 -04:00
Gennadiy Civil
c7f4849c0b Merge pull request #919 from delaitre/patch-1 
Fix the link to the float comparison article
 2017-08-11 10:39:13 -04:00
Gennadiy Civil
052df998c4 Merge pull request #749 from nholthaus/patch-1 
Documentation change to add related open source project
 2017-08-11 10:38:05 -04:00
Gennadiy Civil
e533ff4bd3 Merge pull request #926 from bartshappee/patch-1 
Fix small typo in Cookbook: SeArrayArgument
 2017-08-11 10:33:36 -04:00
Gennadiy Civil
e3bd4cbeae Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix 
Fix library install destinations
 2017-08-11 09:14:49 -04:00
Gennadiy Civil
c81be0f6fc Merge pull request #871 from tommyleo2/master 
Update Primer.md
 2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a Merge pull request #937 from srz-zumix/fix-gtest-port-typo 
Fix or condition typo ( '|' -> '||' )
 2017-08-10 21:30:13 -04:00
Gennadiy Civil
4283f264d6 Merge pull request #957 from sglass68/sim 
Fix a few documentation nits in the mock dummies guide
 2017-08-10 21:25:06 -04:00