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
Gennadiy Civil
4da1d9769d
Merge pull request #1127 from zulkarnine/patch-1
...
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
664a703c70
Merge pull request #1192 from eduherminio/master
...
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
26a5d30ac0
Merge pull request #1191 from gennadiycivil/master
...
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
f326bd27b2
Addressing Comments
2017-08-10 16:33:22 -04:00
drgler
0d121065b4
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:18:22 +02:00
Herbert Thielen
89bd69dff5
say "former version" instead of "released version"
2017-08-10 20:21:46 +02:00
Eduardo Caceres
fccdf51ece
Minor style fixes
...
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
4d386daead
Added Copyright
2017-08-10 12:03:27 -04:00
misterg
a7b338585e
Initial Revision, review 164634031
2017-08-10 11:54:46 -04:00
Gennadiy Civil
d47ef4b7dc
Merge pull request #1178 from aninf-wo/hethi/testsuite-hint
...
add note about different definitions of Test Case
2017-08-10 09:13:45 -04:00
Herbert Thielen
23c3feba97
clarify distinction regarding Test Case
2017-08-10 10:08:08 +02:00
Matthew Woehlke
92b6ea3c94
Fix library install destinations
...
Modify library install destinations to install .dll's to the correct
location (`bin`, not `lib`), and to install other artifacts to the
correct platform-dependent location by using GNUInstallDirs. This is
required for some distributions (e.g. Fedora) and will fix an issue that
otherwise requires those distributions to patch the upstream sources.
Also, add options to suppress installation, which may be useful for
projects that embed Google Test.
Since Google Test is trying to support archaic versions of CMake, a
brain-dead fallback (which requires that the user set either LIB_SUFFIX
or CMAKE_INSTALL_LIBDIR themselves) is included for versions that
predate GNUInstallDirs.
Fixes #1161 .
Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
2017-08-09 15:29:36 -04:00
drgler
ec538fc0b8
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait and prevent infinite loops for recursive containers
2017-08-09 19:08:22 +02:00
drgler
635ccb98a7
Infinite Loop when calling a mock function that takes boost::filesystem::path as parameter #521 : Add is_same type trait
2017-08-09 19:07:22 +02:00
misterg
dd94055b01
WIP
2017-08-09 11:47:54 -04:00
Herbert Thielen
646ebe5ad5
be more specific on Test Case
2017-08-09 16:41:38 +02:00
Eduardo Cáceres
bd84341086
Punctuation
...
Missing periods
2017-08-09 14:10:23 +02:00
Herbert Thielen
fc59509590
Merge branch 'master' into hethi/remove-old-docs
2017-08-09 11:03:27 +02:00
misterg
3ea266427c
WIP, win testing
2017-08-08 15:54:36 -04:00
misterg
5b99572967
WIP, windows testing
2017-08-08 15:37:38 -04:00