Commit Graph

1366 Commits

Author SHA1 Message Date
Herbert Thielen
5a1c936e9e Merge branch 'master' into hethi/unused-import 2017-08-30 10:44:26 +02:00
Herbert Thielen
92ee38b0ce Merge branch 'master' into hethi/travis-unused-cmake 2017-08-30 10:43:54 +02:00
Gennadiy Civil
87e04295f3 Merge pull request from aninf-wo/hethi/fix-typo
fix typo in comment and string (SetUpTestCase)
2017-08-30 00:33:30 -04:00
Gennadiy Civil
f4a64c4c72 Merge branch 'master' into hethi/fix-typo 2017-08-29 23:59:32 -04:00
Gennadiy Civil
4676e5913e Merge pull request from aninf-wo/hethi/typo-issue-1105
fix typos mentioned in issue 1105
2017-08-29 19:31:16 -04:00
Gennadiy Civil
e031083eb3 Merge pull request from aninf-wo/hethi/typo-xUnit
fix typo: xUnit
2017-08-29 19:30:38 -04:00
Gennadiy Civil
cfe8c3ebbf Merge branch 'master' into hethi/typo-xUnit 2017-08-29 19:30:18 -04:00
Gennadiy Civil
132802e909 Merge pull request from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
2017-08-29 19:27:27 -04:00
Gennadiy Civil
4da24d2b53 Merge pull request from aninf-wo/heth/travis-verbose-make
switch on verbose make in travis builds
2017-08-29 19:26:34 -04:00
Scott Graham
4476885245 Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA 2017-08-29 12:45:26 -07:00
Herbert Thielen
f48ebe2bcc use plural verb as mentioned in issue 2017-08-29 21:20:46 +02:00
Herbert Thielen
f3f8930215 remove Yob's comma mentioned in issue 2017-08-29 21:19:45 +02:00
Herbert Thielen
63c4bbc1c2 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
cb70fb93bb switch on verbose make 2017-08-29 17:04:15 +02:00
Herbert Thielen
a1fc4f9e80 remove non-existing gmock_build_samples switch 2017-08-29 16:35:41 +02:00
Gennadiy Civil
71357952d2 Merge branch 'master' into hethi/typo-xUnit 2017-08-29 10:19:33 -04:00
Gennadiy Civil
eb5b0d0ea7 Merge pull request from alyssawilk/flag-default
Adding a flag option to change the default mock type
2017-08-29 10:18:33 -04:00
Herbert Thielen
1133462278 fix typo: xUnit 2017-08-29 15:27:54 +02:00
Herbert Thielen
ad0e3af8a3 remove unused TestCase import 2017-08-29 14:27:10 +02:00
Herbert Thielen
815428993e fix typo in comment and string (SetUpTestCase) 2017-08-29 14:22:09 +02:00
Alyssa Wilk
7eb7cbb51d Applying lint checks from upstream google3 2017-08-28 16:13:41 -04:00
Alyssa Wilk
6a0c4aab6d Merge branch 'refs/heads/master' into flag-default 2017-08-28 16:10:12 -04:00
Brian Silverman
12208b0948 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
84d8831a08 Merge pull request from KindDragon/vs-projects-fix3
Support x64 configuration for old VS2015 projects
2017-08-25 10:31:12 -04:00
Gennadiy Civil
bc44b63f3a Merge branch 'master' into vs-projects-fix3 2017-08-24 22:53:22 -04:00
Gennadiy Civil
1d7514523b Merge pull request from KindDragon/vs-projects-fix2
Remove gtest VS2005 projects
2017-08-24 22:53:00 -04:00
Arkady Shapkin
b0657ae844 Support x64 configuration for old VS2015 projects 2017-08-25 01:58:00 +03:00
Arkady Shapkin
f9f6c5ddcb Remove gtest VS2005 projects 2017-08-25 01:57:35 +03:00
Gennadiy Civil
dd1f44c10a Merge pull request from Dani-Hub/master
Prevent infinite loops for recursive containers like boost::filesystem::path
2017-08-24 10:50:17 -04:00
Gennadiy Civil
34a79744f1 Merge branch 'master' into master 2017-08-23 14:27:55 -04:00
Gennadiy Civil
c8275c755b Merge pull request from KindDragon/vs-projects-fix
Support x64 configuration for VS2010 projects
2017-08-23 14:15:36 -04:00
Daniel Krügler
89f828afa3 Merge branch 'master' into master 2017-08-23 11:11:44 +02:00
Gennadiy Civil
b7b70f5cf9 Merge branch 'master' into bazel 2017-08-22 23:20:53 -04:00
Gennadiy Civil
d2cf069fe2 Merge branch 'master' into vs-projects-fix 2017-08-22 22:38:22 -04:00
Gennadiy Civil
2e06cd7f60 Merge pull request from romkatv/property-matcher
Support ref-qualified member functions in Property().
2017-08-22 22:37:30 -04:00
Arkady Shapkin
40e2b2f67d 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
10d96ee13f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:41 +02:00
drgler
57bd507b1f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 21:13:32 +02:00
drgler
4a8f72f8f1 Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:19:13 +02:00
drgler
0654fb095d Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-22 20:18:54 +02:00
Roman Perepelitsa
75a9eed0f5 Support ref-qualified member functions in Property(). 2017-08-22 16:06:26 +02:00
Daniel Krügler
71b9b22dd6 Merge branch 'master' into master 2017-08-21 20:14:09 +02:00
Gennadiy Civil
1f4def5cde Merge branch 'master' into wrong-version-reported 2017-08-21 13:11:58 -04:00
Gennadiy Civil
63fecf15ab Merge pull request 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
fad8a6b4f5 Remove unused variable 2017-08-21 10:10:14 +02:00
Gennadiy Civil
9fdd6ccd92 Added "explicit" as per compiler suggestion 2017-08-20 15:20:13 -04:00
Gennadiy Civil
e5095758ba Proposing these changes, please review
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Zhongming Qu
9453ae7611 Merge branch 'master' into bazel 2017-08-18 22:22:00 -07:00
Gennadiy Civil
5378815478 Merge branch 'master' into methodname-in-exception 2017-08-18 16:26:02 -07:00
Gennadiy Civil
0d2f766b4e Merge pull request from henryiii/patch-1
Adding CMake visibility policy setting
2017-08-18 16:25:03 -07:00