Gennadiy Civil
aa5f5b1482
Merge branch 'master' into user_logger_instead_of_printf
2017-09-01 00:05:22 -04:00
Gennadiy Civil
b6bf0fd3c0
Merge pull request #870 from KindDragon/mingw64-appveyour
...
AppVeyor MinGW-w64 test build
2017-09-01 00:04:34 -04:00
Arkady Shapkin
c6f12cb3f8
Merge branch 'master' into mingw64-appveyour
2017-09-01 03:02:47 +03:00
Gennadiy Civil
219f518967
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
d12eb73c8d
Merge branch 'master' into mingw64-appveyour
2017-08-31 23:05:00 +03:00
Herbert Thielen
3adc6067bc
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 20:51:49 +02:00
Herbert Thielen
b34d59baf1
change links from former code.google.com to current github repository
2017-08-31 18:12:17 +02:00
Gennadiy Civil
96145f5a53
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
7a6e33b359
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 11:13:09 -04:00
Herbert Thielen
58fd2df28b
Merge branch 'master' into hethi/fix-faq-example-comment
2017-08-31 16:12:27 +02:00
Herbert Thielen
ab657cdfa6
fix example's comment
2017-08-31 16:10:36 +02:00
Gennadiy Civil
cb4c337a26
Merge pull request #865 from frosteyes/master
...
Moved the ignoring of *.pyc files to top level
2017-08-31 09:13:07 -04:00
Che-Hsun Liu
4c7ce5780f
Merge branch 'master' into master
2017-08-31 19:02:12 +08:00
Claus Stovgaard
68622227af
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
...
# Conflicts:
# .gitignore
2017-08-31 12:22:53 +02:00
Herbert Thielen
03c8948894
Merge branch 'master' into hethi/unused-import
2017-08-31 11:39:56 +02:00
Herbert Thielen
8a4a9bcf15
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 08:47:26 +02:00
Gennadiy Civil
731894ae3e
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
6ffdce4cc7
AppVeyor MinGW-w64 test build
2017-08-31 01:16:02 +03:00
Gennadiy Civil
8567479df0
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
af793011f5
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-30 21:46:30 +02:00
Gennadiy Civil
3c58954dec
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
76b0a834a5
removed internal link ( not allowed in OSS)
2017-08-30 14:50:40 -04:00
Scott Graham
63faadca89
Note that it is preferable for Googlers to create a CL internally first
2017-08-30 11:29:06 -07:00
Gennadiy Civil
d5525cdcf8
Merge branch 'master' into master
2017-08-30 14:11:38 -04:00
Herbert Thielen
081b1448ef
create different python based tests for single and multi configuration build generators
2017-08-30 19:17:26 +02:00
Gennadiy Civil
c4b70d8378
Merge branch 'master' into hethi/travis-unused-cmake
2017-08-30 11:49:23 -04:00
Gennadiy Civil
32ee817f35
Merge branch 'master' into hethi/unused-import
2017-08-30 11:47:32 -04:00
Herbert Thielen
cd0574c396
Revert "ask cmake for per-configuration output subdir"
...
This reverts commit 73d58dd4c8
2017-08-30 15:14:34 +02:00
Gennadiy Civil
94138a17cc
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
4a0b472571
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
b0af69a1d7
remove obsolete comment regarding python tests on linux
2017-08-30 12:48:28 +02:00
Herbert Thielen
abb93b4f57
fix SetUp/TearDownTestCase() in AdvancedGuide
...
fixes issue #1087
2017-08-30 12:19:59 +02:00
Herbert Thielen
46396abb47
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
8bcd4b2b84
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
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 #1226 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 #1233 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 #1229 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 #1232 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 #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
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 #1105
2017-08-29 21:20:46 +02:00
Herbert Thielen
f3f8930215
remove Yob's comma mentioned in issue #1105
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
