Gennadiy Civil
e511ab1635
Merge pull request #783 from tobbi/cppcheck_perf_fixes
...
Performance fixes reported by cppcheck
2017-09-01 13:52:33 -04:00
Gennadiy Civil
4126de54a7
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
7da2ee170f
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
aa5f5b1482
Merge branch 'master' into user_logger_instead_of_printf
2017-09-01 00:05:22 -04: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
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
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
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
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
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 73d58dd4c83883b46697798e978d576b28b1d24e.
Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
2017-08-30 15:14:34 +02: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
5a1c936e9e
Merge branch 'master' into hethi/unused-import
2017-08-30 10:44:26 +02: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
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
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
Arkady Shapkin
f9f6c5ddcb
Remove gtest VS2005 projects
2017-08-25 01:57:35 +03:00
Gennadiy Civil
34a79744f1
Merge branch 'master' into master
2017-08-23 14:27:55 -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
57bd507b1f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
0654fb095d
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +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
Tanzinul Islam
a26b1296f4
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2017-08-21 01:13:32 +01:00
Henry Schreiner
3a31c6b4f4
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
gpetit
03b4383719
Removed extra colon in error log
2017-08-14 15:30:01 -04:00
gpetit
65ea26e1ad
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
2017-08-14 13:45:45 -04:00
gpetit
496f7ee6fa
Use GTEST_LOG instead of printf
2017-08-14 13:45:27 -04:00
David Seifert
70c8a8e0bd
Add documentation for pkg-config
2017-08-14 13:45:56 +02:00
David Seifert
a3ab075319
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Che-Hsun Liu
938d669435
Merge branch 'master' into master
2017-08-14 14:51:49 +08:00
Gennadiy Civil
be0f3823ba
Merge pull request #905 from iignatev/master
...
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
17af07aed9
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
...
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
240309b6a2
Merge pull request #871 from tommyleo2/master
...
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
db1a847416
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
6c8b263997
Merge pull request #1164 from aninf-wo/hethi/remove-old-docs
...
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
