3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-15 00:47:54 +08:00
Code Issues Projects Releases Wiki Activity
1,261 Commits 7 Branches 27 Tags 39 MiB
Commit Graph

1261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
def0b32119 Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment 
remove unused variables from travis environment
 2017-09-08 07:15:19 -04:00
Herbert Thielen
8620328bca Merge branch 'master' into hethi/cleanup-travis-environment 2017-09-08 11:38:27 +02:00
Gennadiy Civil
894cdb82cb Merge pull request #1251 from aninf-wo/hethi/drop-valgrind-installation-on-travis 
drop unused valgrind package from Travis build slave installation
 2017-09-07 23:04:18 -04:00
Gennadiy Civil
f3500ce23a Merge pull request #1243 from aninf-wo/hethi/travis-release-build 
switch one Trevis build to Release mode
 2017-09-07 23:03:09 -04:00
Herbert Thielen
6c0146fd00 use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function 2017-09-07 17:33:19 +02:00
Herbert Thielen
bc60b5a827 Merge branch 'master' into hethi/travis-release-build 2017-09-07 11:05:28 +02:00
Gennadiy Civil
a33b6b0919 Merge pull request #1246 from aninf-wo/hethi/enable-travis-gcc-cache 
enable Travis ccache to speed up CI builds
 2017-09-06 16:52:22 -04:00
Gennadiy Civil
8a3ccc3ee3 Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds 
run parallelized builds on Travis CI
 2017-09-06 14:27:07 -04:00
Herbert Thielen
be94bf501e remove unused variables from travis environment 2017-09-05 19:18:58 +02:00
Gennadiy Civil
857ddeadeb Merge pull request #975 from LebedevRI/respect-option 
CMake: use threads if allowed and found, not just if found.
 2017-09-05 13:07:37 -04:00
Herbert Thielen
beca85ff4a drop unused valgrind package from installation 
... and remove explicit gcc installation (will be installed with g++
automatically)
 2017-09-05 17:39:04 +02:00
Herbert Thielen
dd8e4a6358 reset ccache statistics at install 2017-09-05 16:36:23 +02:00
Herbert Thielen
56f8222a14 show ccache statistics in log 2017-09-05 16:36:23 +02:00
Herbert Thielen
83d8dd0e9c call clang via ccache on Linux 2017-09-05 16:36:23 +02:00
Herbert Thielen
fe97312e24 limit processors to use in Travis build to 4 2017-09-04 18:56:52 +02:00
Herbert Thielen
98f2f15253 install ccache on travis osx build slave 2017-09-04 18:40:03 +02:00
Herbert Thielen
d96a038e8b set MAKEFLAGS to use multiple processors on Travis CI 2017-09-04 18:19:06 +02:00
Herbert Thielen
48b0662880 cache ccache 2017-09-04 17:37:58 +02:00
Herbert Thielen
55fd999adf avoid warning about unused variable 2017-09-04 17:23:41 +02:00
Herbert Thielen
8abacca52e avoid -Wshadow warning on GCC 
When using INSTANTIATE_TEST_CASE_P with a lambda function which uses
'info' as parameter name, GCC complains that this would shadow
parameter 'info' used in the macro's VA_ARGS call.
 2017-09-04 17:18:16 +02:00
Herbert Thielen
520ad96b78 treat all warnings as errors for GCC (-Werror) 2017-09-01 21:55:26 +02:00
Herbert Thielen
d15b8b4524 switch one build to Release mode 
This turns on optimization which allows the compiler to discover more
problems and omit some more warnings.
 2017-09-01 21:55:11 +02:00
Gennadiy Civil
7c6353d29a Merge pull request #900 from Gallaecio/patch-1 
Fix WhenSorted() documentation example
 2017-09-01 15:20:54 -04:00
Roman Lebedev
1a62d1b088
CMake: use threads if allowed and found, not just if found. 
If the user's cmakelists.txt first look for threads using
find_package(Threads), then set(gtest_disable_pthreads ON),
and then include googletest. GoogleTest will not look for
threads. But since they have already been found before in
user's cmakelists, it will use them regardless.

This helped me fix build issue in darktable-org/rawspeed
on windows/MSYS2, even though there are threads, and they
are usable, googletest build was failing with issues
about AutoHandle. I was first looking for threads, and only
then including googletest, so no matter the value of
gtest_disable_pthreads, it failed.

The other obvious solution is for user to first include
googletest, and only then look for threads by himself.
 2017-09-01 21:02:59 +03:00
Gennadiy Civil
52b6ca3428 Merge pull request #783 from tobbi/cppcheck_perf_fixes 
Performance fixes reported by cppcheck
 2017-09-01 13:52:33 -04:00
Gennadiy Civil
e4f6c0b358 Merge pull request #1011 from zeitounator/wrong-version-reported 
Wrong version reported (1.7.0 should be 1.8.0)
 2017-09-01 13:38:26 -04:00
Gennadiy Civil
b3a1f87f0c Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type 
use cmake build type defined in .travis.yml for travis builds
 2017-09-01 10:07:43 -04:00
Gennadiy Civil
69e794ca75 Merge pull request #870 from KindDragon/mingw64-appveyour 
AppVeyor MinGW-w64 test build
 2017-09-01 00:04:34 -04:00
Arkady Shapkin
633488a763 Merge branch 'master' into mingw64-appveyour 2017-09-01 03:02:47 +03:00
Gennadiy Civil
836c194a81 Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links 
change links from former code.google.com to current github repository
 2017-08-31 18:28:19 -04:00
Arkady Shapkin
8282229d4f Merge branch 'master' into mingw64-appveyour 2017-08-31 23:05:00 +03:00
Herbert Thielen
2a720ac1bb Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 20:51:49 +02:00
Herbert Thielen
e033d8c73d change links from former code.google.com to current github repository 2017-08-31 18:12:17 +02:00
Gennadiy Civil
92e920730d Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment 
fix example's comment
 2017-08-31 12:10:49 -04:00
Gennadiy Civil
7f27d8bdd1 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 11:13:09 -04:00
Herbert Thielen
84bd72ba3c Merge branch 'master' into hethi/fix-faq-example-comment 2017-08-31 16:12:27 +02:00
Herbert Thielen
14cf7f574a fix example's comment 2017-08-31 16:10:36 +02:00
Gennadiy Civil
a430e9c176 Merge pull request #865 from frosteyes/master 
Moved the ignoring of *.pyc files to top level
 2017-08-31 09:13:07 -04:00
Claus Stovgaard
34355c0e87 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 
# Conflicts:
#	.gitignore
 2017-08-31 12:22:53 +02:00
Herbert Thielen
d6c46ebd04 Merge branch 'master' into hethi/issue-1175-cmake-build-type 2017-08-31 08:47:26 +02:00
Gennadiy Civil
16bfba08e2 Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake 
remove non-existing gmock_build_samples switch
 2017-08-30 22:18:24 -04:00
Arkadiy Shapkin
5dde668e09 AppVeyor MinGW-w64 test build 2017-08-31 01:16:02 +03:00
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
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
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
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
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
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