Gennadiy Civil
ad0146bfe2
Merge branch 'master' into win-libcxx
2018-01-23 12:32:44 -05:00
Gennadiy Civil
6723b6c588
Merging, upstream http://cl/182836545
2018-01-23 10:15:28 -05:00
Gennadiy Civil
bbb17ad0f7
more code merge
2018-01-22 15:28:55 -05:00
Gennadiy Civil
f1c87ad9f5
merges, cl/155419551 and other
2018-01-22 15:20:19 -05:00
Gennadiy Civil
9bc86661f8
more merging
2018-01-22 14:43:51 -05:00
Gennadiy Civil
a0435a54ce
merging
2018-01-22 14:14:05 -05:00
Gennadiy Civil
8d707dfe81
code merge
2018-01-22 11:47:30 -05:00
Gennadiy Civil
1489dc8daa
Merge branch 'master' into support_xboxone
2018-01-18 17:42:34 -05:00
Gennadiy Civil
20b53ad786
Merge branch 'master' into win-libcxx
2018-01-18 17:41:36 -05:00
Gennadiy Civil
b1623e9144
Adding python tests to Bazel build file.
2018-01-18 14:32:31 -05:00
Fedor Trushkin
8e862211a2
Use fully qualified in examples
2018-01-18 10:38:25 +01:00
Fedor Trushkin
354fc8d8b1
Document ScopedTrace utility
2018-01-18 10:34:05 +01:00
Peter Collingbourne
ba99a04be2
Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
...
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
2018-01-17 20:29:10 -08:00
Fedor Trushkin
9c82e7745c
Expose ScopedTrace utility in public interface
2018-01-17 16:41:59 +01:00
Gennadiy Civil
08b323f717
Reverting some changes, need to make the merge compile
2018-01-15 18:16:11 -05:00
Gennadiy Civil
9195571c69
Reverting some changes, need to make the merge compile
2018-01-15 17:39:33 -05:00
Gennadiy Civil
6d04de7419
Reverting some changes, need to make the merge compile
2018-01-15 17:36:45 -05:00
Gennadiy Civil
b9e297838d
Reverting some changes, need to make the merge compile
2018-01-15 17:34:46 -05:00
Gennadiy Civil
304be8f009
Test files for corresponding changes
2018-01-15 17:15:52 -05:00
Gennadiy Civil
6befe422f2
Test files for corresponding changes
2018-01-15 16:59:57 -05:00
Gennadiy Civil
f45c22c482
Test files for corresponding changes
2018-01-15 16:56:17 -05:00
Gennadiy Civil
5f4ce9d884
Test files for corresponding changes
2018-01-15 16:46:16 -05:00
Gennadiy Civil
d629744ec0
More code merges
2018-01-15 16:23:23 -05:00
Gennadiy Civil
da1f7fe1e7
Code merging
2018-01-15 16:06:32 -05:00
gpetit
33d73d42b4
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
2018-01-12 10:20:26 -05:00
Gennadiy Civil
93b77987f5
continue upstream/merge, etc
2018-01-11 17:36:34 -05:00
Gennadiy Civil
6914ae2394
Upstream cl 103120214
2018-01-11 11:31:23 -05:00
Gennadiy Civil
1d757db65c
More merge, cleanup
2018-01-10 16:49:20 -05:00
Gennadiy Civil
481fe9446a
More merge, cleanup
2018-01-10 16:45:59 -05:00
Gennadiy Civil
6a26e47cfc
Code merge, upstreaming accumulated changes, cleanup
2018-01-10 14:42:29 -05:00
Gennadiy Civil
62dbaa2947
revert
2018-01-10 14:00:52 -05:00
Gennadiy Civil
d630a8bdac
code merges, cleanup
2018-01-10 13:58:00 -05:00
Gennadiy Civil
f33902b97a
revert googletest/test/gtest-param-test_test.cc
2018-01-10 11:04:49 -05:00
Gennadiy Civil
d237297ceb
code merge, cleanups
2018-01-09 22:46:17 -05:00
Gennadiy Civil
2ad5661db2
Upstream of cl 129104714
2018-01-09 16:41:15 -05:00
Gennadiy Civil
5eecadf67a
Revert one file
2018-01-09 15:46:44 -05:00
Gennadiy Civil
9fce984a67
wip, cleanups/merge
2018-01-09 14:48:06 -05:00
Gennadiy Civil
1df907381d
Merge branch 'master' into master
2018-01-09 14:00:25 -05:00
Gennadiy Civil
258fd6e168
cleanup, merge
2018-01-09 13:59:27 -05:00
Loo Rong Jie
cbd15d417e
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
...
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
91ba05cc36
Small cleanups, merge
2018-01-08 16:14:06 -05:00
Gennadiy Civil
fab06101d7
Merge branch 'master' into master
2018-01-05 15:34:07 -05:00
Gennadiy Civil
67476c1426
Revert one file for now
2018-01-05 12:35:41 -05:00
Gennadiy Civil
6b4967a23a
Merge branch 'master' into missing-declarations
2018-01-04 22:01:38 -05:00
Gennadiy Civil
abbc0f8174
Merge pull request #1377 from davidben/clang-cl
...
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
2018-01-04 21:59:48 -05:00
Gennadiy Civil
19b5774ccf
code cleanup in preparation for merges, cl 180857299
2018-01-04 21:49:27 -05:00
Gennadiy Civil
4216f869f7
Merge branch 'master' into master
2018-01-04 10:13:00 -05:00
Gennadiy Civil
1c09831acc
upstreaming cl 124976692
2018-01-03 16:57:05 -05:00
David Benjamin
1acf8c752e
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.
...
clang-cl is clang for Windows running in MSVC mode. Chromium uses it for
Windows builds. clang-cl is weird in that it defines __clang__ and
_MSC_VER, but *NOT* __GNUC__. This is vaguely analogous to how normal
clang defines __clang__ (what it is) and __GNUC__ (what it is compatible
with).
However, clang-cl still implements most GCC extensions, being clang.
Notably, the way to control -Wformat-literal is still with
__attribute__((__format__)). For better error-checking and strict
-Wformatl-literal compatibility (see
53c478d639
2018-01-03 14:55:52 -05:00
David Benjamin
b3d9be5c1d
Pass the -Wmissing-declarations warning.
...
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
2018-01-03 14:50:22 -05:00
Gennadiy Civil
26addade17
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2018-01-03 14:15:14 -05:00
Gennadiy Civil
ba6ecedede
Merge pull request #1374 from davidben/tuple-msvc
...
Fix testing::Combine on MSVC 2017.
2018-01-03 14:11:38 -05:00
Gennadiy Civil
88760a299f
Merge pull request #991 from davidben/uintptr
...
Pass MSVC's C4826 warning.
2018-01-03 14:10:29 -05:00
Gennadiy Civil
a3da63d97a
Merge branch 'master' into tuple-msvc
2018-01-03 13:04:37 -05:00
Gennadiy Civil
a9fa67cbe4
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2018-01-03 12:51:09 -05:00
misterg
e7734fb80c
OSS Sync, cl 163329677
2018-01-02 14:42:09 -05:00
David Benjamin
90244a6aef
Fix testing::Combine on MSVC 2017.
...
On platforms with std::tuple and not std::tr1::tuple, GTEST_HAS_COMBINE
gets turned off when it works fine (due to GTEST_TUPLE_NAMESPACE_).
Elsewhere in the project, several GTEST_HAS_TR1_TUPLE checks
additionally check GTEST_HAS_STD_TUPLE_, so use that formulation.
(The ones that don't are specific to std::tr1::tuple and are followed by
an identical GTEST_HAS_STD_TUPLE_ version underneath it.)
In particular, this fixes testing::Combine on MSVC 2017, which regressed
here:
https://github.com/google/googletest/pull/1348#issuecomment-353879010
2018-01-02 12:57:49 -05:00
Gennadiy Civil
fa6730103e
Merge branch 'master' into uintptr
2018-01-02 10:54:26 -05:00
David Benjamin
bcd35523cd
Avoid warning C4619 in MSVC 2017.
...
C4800 has since been removed in MSVC 2017, so trying to silence it
throws warning C4619 when enabled.
2017-12-25 11:02:02 -05:00
Gennadiy Civil
e76c3f837c
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-22 14:47:25 -05:00
Gregory Pakosz
7990f56637
Re-enable MSVC++ C4389 warning in CmdHelperEq()
...
C4389 was inhibited in commit 4b83461
2017-12-21 16:35:38 +01:00
bryanzim
e17907da80
Update internal_utils.cmake
2017-12-20 10:06:20 -05:00
bryanzim
773cc78765
Merge branch 'master' into master
2017-12-20 08:21:22 -05:00
Gennadiy Civil
b5b6a07d14
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-19 13:43:22 -05:00
Gennadiy Civil
a7fceb4a98
Update gtest-param-test.h.pump
2017-12-19 10:58:37 -05:00
Gennadiy Civil
8a48f0ed4e
Update gtest-param-test.h.pump
2017-12-19 10:55:49 -05:00
Gennadiy Civil
058b318bc7
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-18 12:02:12 -05:00
bryanzim
8cbda54f48
Merge branch 'master' into master
2017-12-15 16:52:50 -05:00
Gennadiy Civil
f6c44fe318
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-15 15:49:46 -05:00
Carlos O'Ryan
f34cbefe50
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
2017-12-11 19:34:19 -05:00
Carlos O'Ryan
23a014ab57
Refactor docs about contributions to CONTRIBUTING.md.
...
Per the review comments.
2017-12-11 19:33:27 -05:00
Bryan Zimmerman
3ea06317cd
remove implicit casts
2017-12-11 12:19:56 -05:00
bryanzim
f98c20baa8
Merge branch 'master' into master
2017-12-11 09:37:55 -05:00
Gennadiy Civil
55fca1937d
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-09 09:41:02 -05:00
Gennadiy Civil
10ef1d9a1e
Merge branch 'master' into use-system-includes
2017-12-08 15:11:13 -05:00
Gennadiy Civil
a30e15b144
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
2017-12-08 11:56:41 -05:00
bryanzim
4aae1600d0
Merge branch 'master' into master
2017-12-08 11:31:31 -05:00
Wojciech Mamrak
57bb0bbbf8
Remove C4996 warning in VS2017
2017-12-07 18:20:25 +01:00
Wojciech Mamrak
8d9d6bb0a3
Improved description of VS std::tuple support
2017-12-07 18:17:43 +01:00
bryanzim
11d21b7c2a
Merge branch 'master' into master
2017-12-06 11:09:00 -05:00
Carlos O'Ryan
aea8580ecf
Run autoconf from top-level directory.
...
This is part (hopefully all) of the fixes for #776 . The top-level
configure.ac configures googletest first and then googlemock.
With this changes it is possible to embed googletest into another
project that uses autoconf. For an example (though it is WIP), see
the commits (and soon PR) referenced from google/protobuf#236 .
2017-12-03 14:07:35 -05:00
Gennadiy Civil
9e236748fb
Merge branch 'master' into master
2017-12-01 16:41:53 -05:00
Gennadiy Civil
c5cba7d17a
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-12-01 16:31:29 -05:00
Gennadiy Civil
ce919c3ddf
Merge branch 'master' into use-system-includes
2017-12-01 16:29:28 -05:00
Sam Lunt
f46bd00e36
make includes system
2017-11-27 17:31:07 -06:00
Bryan Zimmerman
a7269e24ac
replaced back accidently removed static_cast with consistent ImplicitCast_
2017-11-22 09:41:32 -05:00
Gennadiy Civil
49eb76df47
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-11-07 10:32:23 -08:00
whame
82447f23be
Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output
2017-11-07 15:22:50 +01:00
bryanzim
530885cbd5
Merge branch 'master' into master
2017-10-30 16:58:25 -04:00
Herbert Thielen
8866af0386
remove markdown stars (bold) from code examples
2017-10-29 17:12:00 +01:00
Bryan Zimmerman
1ae4096b9c
fix for VS2017 deprecation of ::tr1::tuple
...
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
2017-10-27 14:01:16 -04:00
m-gupta
060783b7d2
Merge branch 'master' into gtestapifix
2017-10-25 10:24:56 -07:00
Arkadiy Shapkin
2641b021fc
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
77380cddf7
Enable C++11 features for VS2015 and VS2017
2017-10-25 03:24:49 +03:00
Manoj Gupta
1beff241c3
googletest: Add GTEST_API_ attribute to ThreadLocal class.
...
ThreadLocal class needs to be have default visibility.
Root cause is gtest uses typeinfo for the ThreadLocal class.
The problem manifests When gtest/gmock are built as a shared library
with libc++. When a class is used in typeinfo, it must have default
visibility.
There is an explanation about typeinfo and visibility here:
https://developer.apple.com/library/content/documentation/DeveloperTools/Conceptual/CppRuntimeEnv/Articles/SymbolVisibility.html
When libc++ is used with gtest in shared library mode, any tests
that are compiled with -fvisibility=hidden and exercise the
macro EXPECT_CALL, it results in an abort like:
[ FATAL ] /usr/include/gtest/internal/gtest-port.h:1394::
Condition typeid(*base) == typeid(Derived) failed.
This is because the typeinfo for ThreadLocal class is not visible.
Therefore, linker failed to match it to the shared library symbol, creating a
new symbol instead.
This fixes https://github.com/google/googletest/issues/1207 .
2017-10-20 14:41:06 -07:00
Gennadiy Civil
c208d8df23
Merge branch 'master' into master
2017-10-20 17:25:41 -04:00
Joe Alam
4597ec587c
Updated README with information about C runtime dynamic/static linking issues in Windows
2017-10-07 23:34:53 +01:00
Herbert Thielen
ceee80c383
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-10-04 21:03:47 +02:00
Jonathan Wakely
b70cf1a663
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Herbert Thielen
98024ad202
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-09-24 10:01:52 +02:00
Gennadiy Civil
89f45180e0
Merge branch 'master' into master
2017-09-23 16:51:27 -04:00
Gennadiy Civil
d30a37e743
Revert "Allow macros inside of parametrized test names."
2017-09-21 10:54:14 -04:00
Gennadiy Civil
ff6796877f
Merge pull request #1245 from sheepmaster/2017_09_04_parametrized
...
Allow macros inside of parametrized test names.
2017-09-21 10:52:47 -04:00
stkhapugin@chromium.org
cf512a099c
Swap reinterpret_cast for static_cast
...
Swap reinterpret_cast for static_cast
2017-09-19 12:44:52 +02:00
Benjamin Kircher
d4af64ca13
Remove redundant declaration
...
TempDir() function is declared twice, once in `internal/gtest-port.h`
and a second time in `gtest.h`.
Fixes a warning with GCC when -Wredundant-decls is given.
2017-09-16 11:51:36 +02:00
ly2048
9681b4c8e6
Add explicit CMAKE_DEBUG_POSTFIX option
...
Enable generating different library name to be compatible with CMake's `FindGTest`.
2017-09-14 13:22:04 +08:00
Alexey Sokolov
c9cf07a8ba
Make the failure messages from EXPECT_EQ and friends actually symmetric,
...
instead of reading more like reversing the former "expected" and "actual"
roles of the LHS and RHS arguments.
This patch is manually applied from internal version (125109873)
2017-09-13 18:18:20 +01:00
Gennadiy Civil
6133038886
Merge pull request #1227 from aninf-wo/hethi/unused-import
...
remove unused TestCase import
2017-09-12 08:44:58 -04:00
Gennadiy Civil
ecc5182dbd
Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non-existing-path
...
remove obsolete link_directories command
2017-09-11 12:15:11 -04:00
Gennadiy Civil
eb695b0f11
Merge branch 'master' into hethi/unused-import
2017-09-11 11:02:44 -04:00
Gennadiy Civil
3663d67170
Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf
...
User logger GTEST_LOG instead of printf in gtest.cc to log errors
2017-09-11 10:53:09 -04:00
Herbert Thielen
803ab9a860
Merge branch 'master' into hethi/remove-linker-warning-on-non-existing-path
2017-09-08 11:47:45 +02:00
Herbert Thielen
c86fbd766b
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
2017-09-08 11:47:14 +02:00
Stepan Khapugin
6508a66622
Merge branch 'master' into master
2017-09-08 11:46:31 +02:00
Herbert Thielen
1b5b246ff9
Merge branch 'master' into hethi/unused-import
2017-09-08 11:45:58 +02:00
Herbert Thielen
6c0146fd00
use GTEST_ATTRIBUTE_UNUSED_ instead of dummy function
2017-09-07 17:33:19 +02:00
Stepan Khapugin
e43a5948d5
Merge branch 'master' into master
2017-09-07 15:44:18 +02:00
Gasprd Petit
900cc4bca5
Merge commit 'a33b6b091999d44f771761be03beb64d3af2350a' into user_logger_instead_of_printf
2017-09-07 07:49:00 -04:00
Gasprd Petit
f6dde80e94
Removed flush scopes around GTEST_LOG(FATAL) and exit call since FATAL is expected to abort()
2017-09-07 07:47:09 -04:00
Herbert Thielen
bc60b5a827
Merge branch 'master' into hethi/travis-release-build
2017-09-07 11:05:28 +02:00
Bernhard Bauer
a92c362cfb
Merge branch 'master' into 2017_09_04_parametrized
2017-09-06 11:25:46 +01: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
Stepan Khapugin
9a8794faed
add a cast
2017-09-05 14:10:53 +02:00
Herbert Thielen
e8c6942ac1
remove obsolete link_directories command
...
It's not necessary, as the target_link_libraries command contains an
absolute path already, and the path given doesn't exist anymore,
leading only to linker warnings like:
ld: warning: directory not found for option
'-L/Users/travis/build/google/googletest/build/googlemock/gtest/src'
2017-09-05 12:01:14 +02:00
Herbert Thielen
88b76525dd
Merge branch 'master' into hethi/unused-import
2017-09-05 11:32:13 +02:00
Herbert Thielen
aa0b5458a1
remove GTEST_HAS_PARAM_TESTS
...
As mentioned in issue #360 :
"Now that all the platforms gtest supports work with value-parameterized
tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from
the codebase everywhere."
https://github.com/google/googletest/issues/360
2017-09-04 19:38:35 +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
Bernhard Bauer
86e5f0083e
Add a non-parametrized test.
2017-09-04 15:46:31 +01:00
Bernhard Bauer
e7c9e80e63
Allow macros inside of parametrized test names.
...
This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling.
2017-09-04 15:46:31 +01:00
Herbert Thielen
520ad96b78
treat all warnings as errors for GCC (-Werror)
2017-09-01 21:55:26 +02: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
ee53b281ba
Merge branch 'master' into user_logger_instead_of_printf
2017-09-01 00:05:22 -04: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
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
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
Che-Hsun Liu
3eaba9f07c
Merge branch 'master' into master
2017-08-31 19:02:12 +08: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
1a8ba67414
Merge branch 'master' into hethi/unused-import
2017-08-31 11:39:56 +02:00
Herbert Thielen
d6c46ebd04
Merge branch 'master' into hethi/issue-1175-cmake-build-type
2017-08-31 08:47:26 +02: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
4db9a748e3
Merge branch 'master' into hethi/unused-import
2017-08-30 11:47:32 -04:00
Herbert Thielen
47ad2993b6
Revert "ask cmake for per-configuration output subdir"
...
This reverts commit 73d58dd4c8
2017-08-30 15:14:34 +02: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
d6562b5a57
Merge branch 'master' into hethi/unused-import
2017-08-30 10:44:26 +02: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
b567aadd1b
remove unused TestCase import
2017-08-29 14:27:10 +02:00
Herbert Thielen
daaed2b6cb
fix typo in comment and string (SetUpTestCase)
2017-08-29 14:22:09 +02:00
Brian Silverman
4d26df729c
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
45287f3dff
Remove gtest VS2005 projects
2017-08-25 01:57:35 +03:00
Gennadiy Civil
87327b12e9
Merge branch 'master' into master
2017-08-23 14:27:55 -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
d93ce9d6fb
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 21:13:32 +02:00
drgler
6404d45a92
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-22 20:18:54 +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
Henry Schreiner
5518a1d350
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
ca76206f42
Removed extra colon in error log
2017-08-14 15:30:01 -04:00
gpetit
0c3c811164
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
2017-08-14 13:45:45 -04:00
gpetit
8f04622cc1
Use GTEST_LOG instead of printf
2017-08-14 13:45:27 -04:00
David Seifert
9cacce4e5c
Add documentation for pkg-config
2017-08-14 13:45:56 +02:00
David Seifert
8604c4adac
Add support for pkgconfig
2017-08-14 13:45:56 +02:00
Che-Hsun Liu
24696c3958
Merge branch 'master' into master
2017-08-14 14:51:49 +08:00
Gennadiy Civil
673c975a96
Merge pull request #905 from iignatev/master
...
enable null detection on Solaris Studio 12u4+
2017-08-13 21:34:10 -04:00
Gennadiy Civil
e3bd4cbeae
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix
...
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
c81be0f6fc
Merge pull request #871 from tommyleo2/master
...
Update Primer.md
2017-08-10 21:34:15 -04:00
Gennadiy Civil
c523461f3a
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
c822c85659
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
1579064390
Merge pull request #1127 from zulkarnine/patch-1
...
Fix background color in ColoredPrintf
2017-08-10 20:43:26 -04:00
Gennadiy Civil
cfab28d594
Merge pull request #1192 from eduherminio/master
...
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
e578186528
Merge pull request #1191 from gennadiycivil/master
...
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
97a8498873
Addressing Comments
2017-08-10 16:33:22 -04:00
drgler
07bba78a5f
Merge branch 'master' of github.com:Dani-Hub/googletest
2017-08-10 21:18:22 +02:00
Herbert Thielen
dc7214f222
say "former version" instead of "released version"
2017-08-10 20:21:46 +02:00
Eduardo Caceres
854b28f199
Minor style fixes
...
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
cb5b05436d
Added Copyright
2017-08-10 12:03:27 -04:00
misterg
b98e30b427
Initial Revision, review 164634031
2017-08-10 11:54:46 -04:00
Gennadiy Civil
75f0723c45
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
c09e9e646d
clarify distinction regarding Test Case
2017-08-10 10:08:08 +02:00
Matthew Woehlke
0e8e0e07d6
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
71ca4bae10
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
484ec91c22
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
ac885f3ab2
WIP
2017-08-09 11:47:54 -04:00
Herbert Thielen
33edcaed89
be more specific on Test Case
2017-08-09 16:41:38 +02:00
Eduardo Cáceres
67fcf00703
Punctuation
...
Missing periods
2017-08-09 14:10:23 +02:00
Herbert Thielen
e022dcded8
Merge branch 'master' into hethi/remove-old-docs
2017-08-09 11:03:27 +02:00
misterg
ab8f2b0d09
WIP, win testing
2017-08-08 15:54:36 -04:00
misterg
40a909b4e5
WIP, windows testing
2017-08-08 15:37:38 -04:00
misterg
a2006b2ab0
WIP, windows testing
2017-08-08 15:34:40 -04:00
misterg
c75de0aa92
WIP, windows testing
2017-08-08 15:32:30 -04:00
misterg
8815087cfa
WIP
2017-08-08 15:17:56 -04:00
Gennadiy Civil
40aa72c7dc
Merge pull request #675 from theHacker/master
...
Fix: Markdown in V1_7_Primer.md
2017-08-08 11:53:40 -04:00
Gennadiy Civil
22d1a7a1a7
Merge pull request #909 from AsturaPhoenix/patch-1
...
Update Primer.md
2017-08-07 23:01:42 -04:00
Gennadiy Civil
7890f7215e
Merge pull request #1180 from aconverse/master
...
Use wider types to prevent unsigned overflow diagnostics
2017-08-07 15:37:15 -04:00
David Benjamin
ca6a70c608
Pass MSVC's C4826 warning.
...
MSVC has an optional warning which flags when 32-bit pointers get cast
into a 64-bit value. This is a little overaggressive I think, but to
ease compiling in projects with aggressive warnings, fix this by just
casting to const void * directly. Modern GCCs seem to compile it just
fine.
2017-08-07 14:56:40 -04:00
misterg
aecea3842c
Samples changes upstreaming
2017-08-07 13:25:03 -04:00
misterg
52a9c14c48
Samples changes upstreaming
2017-08-07 13:20:57 -04:00
Herbert Thielen
0f702cebb0
add note about different definitions of Test Case
...
There are contradictory definitions of the term "test case", so prepare
new users in Primer.md to avoid confusion.
2017-08-05 15:12:12 +02:00
Herbert Thielen
212f4d793e
fix small typo in comment
2017-08-05 12:42:00 +02:00
Alex Converse
deb99a9d26
Use wider types to prevent unsigned overflow diagnostics
...
The rest of the (covered) codebase is already integer overflow clean.
This is a cherry-pick of an internal change.
TESTED=gtest_shuffle_test goes from fail to pass with -fsanitize=integer
2017-08-03 14:12:25 -07:00
Gennadiy Civil
ca102b1f9d
Merge pull request #1030 from vpfautz/master
...
Fixed some typos
2017-08-03 16:49:13 -04:00
Gennadiy Civil
e1f3d8d175
Merge pull request #671 from mehagar/patch-1
...
Fix typo in AdvancedGuide.md
2017-08-02 17:07:27 -04:00
Gennadiy Civil
0cb2eeb5f1
Merge pull request #764 from flyd1005/wip-fix-typo
...
remove duplicated words
2017-08-02 17:04:33 -04:00
Gennadiy Civil
73f321590a
Merge pull request #962 from klimkin/klimkin-patch-typo
...
Fix a typo
2017-08-02 16:55:50 -04:00
Gennadiy Civil
d966d5fbe0
Merge pull request #968 from nicolacavallini/link_typed_test_docs
...
added link to sample 6 in the documentation of typed test
2017-08-02 16:45:13 -04:00
misterg
f63e2a14a2
WIP
2017-08-01 14:36:29 -04:00
Herbert Thielen
ec19d455bc
fix links to Google C++ Style Guide
2017-07-30 17:05:48 +02:00
Herbert Thielen
b3908406e6
remove doc of former versions
...
The documentation of former versions is available in the history (e.g.
by checking out the appropriate git tags), so there is no need to keep
them in parallel to the current documentation.
2017-07-30 16:26:29 +02:00
Herbert Thielen
f6ac9a30a4
remove obsolete reference to SVN trunk
2017-07-30 16:25:58 +02:00
Gennadiy Civil
6527ee0624
Merge pull request #1107 from lipk/patch-1
...
Minor grammar fix in docs.
2017-07-26 15:29:54 -04:00
Zulkarnine Mahmud
2960aa54e2
Remove duplicate code
2017-07-16 21:59:26 +09:00
Zulkarnine Mahmud
a6b146dfdd
Fix assumption for foreground bit offset
2017-07-15 17:44:18 +09:00
Vincent Palancher
4568374a6e
Fixes a typo in FAQ.md
2017-07-05 14:12:58 +02:00
Che-Hsun Liu
509f7fe840
Update googletest README.md
...
Use `EXCLUDE_FROM_ALL` in `add_subdirectory` to prevent `make install` from including lots of headers from gtest/gmock.
```
add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
${CMAKE_BINARY_DIR}/googletest-build
EXCLUDE_FROM_ALL)
```
2017-07-02 20:19:03 +08:00
Zulkarnine Mahmud
6a75e3c169
Remove unnecessary const
2017-06-29 09:52:41 +09:00
Zulkarnine Mahmud
26b7ac3b18
Add helper functions for text color calculation
2017-06-29 09:47:52 +09:00
Billy Donahue
4bab34d208
Merge pull request #1081 from krytarowski/netbsd-1
...
Add NetBSD support
2017-06-23 19:35:25 -04:00
Zulkarnine Mahmud
271fb8ff5e
Fix a problem when bg_color == fg_color
...
Invert the intensity bit if the background_color == foreground_color
2017-06-22 11:06:17 +09:00
Chris-Sharpe
19cace2873
Colouring in help text
2017-06-21 16:19:25 +01:00
Zulkarnine Mahmud
365df11427
Add background_mask instead of using magic number
2017-06-21 09:17:51 +09:00
Zulkarnine Mahmud
649aa29552
Fix background color in ColoredPrintf
...
Re-use existing background color for Widows' console window.
This fixes a problem where the background color for ColoredPrintf would be BLACK even if the user's console is using a different BG color.
2017-06-20 15:40:53 +09:00
Billy Donahue
c2d90bddc6
Create gtest-internal.h
2017-06-11 18:34:04 -04:00
jorgehb
00ed9b566e
Fixing float comparison broken link
...
Updating the link with a valid one. The old one was considered obsolete by the publisher.
2017-06-08 10:01:55 -04:00
lipk
dca9d5fc51
Remove unnecessary 'the'.
2017-05-30 17:29:32 +02:00
Billy Donahue
42bc671f47
Merge pull request #1091 from nico/wmicro
...
Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
2017-05-23 11:10:42 -04:00
Gennadiy Civil
76491b74de
Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093
2017-05-18 10:19:28 -04:00
Billy Donahue
7cc548dcbf
Merge pull request #1089 from nico/stdstring
...
Use std::string and ::string explicitly in gtest and gmock code.
2017-05-16 17:00:03 -04:00
Billy Donahue
078d5d930a
Merge pull request #1090 from nico/typo
...
Fixing typo in documentation.
2017-05-15 23:54:23 -04:00
Nico Weber
e1466ba4fe
Gender-neutralize comments in gtest.h.
...
This merges a Google-internal change.
2017-05-15 18:00:29 -04:00
Nico Weber
09fd5b3ebf
Use std::string and ::string explicitly in gtest and gmock code.
...
This merges a Google-internal change (117235625).
Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
2017-05-15 17:53:04 -04:00
Nico Weber
b2cbbec04c
Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.
...
This upstreams a Google-internal change.
Original CL description:
The C++ standard says that function pointers are not implicitly
convertible to object pointers. Visual Studio disregards that and allows
implicit conversion between function pointers and object points, and
enough code relies on this that clang follows suit in
Microsoft-compatibility mode.
However, clang emits a -Wmicrosoft-cast warning when such a conversion
is done:
E:\b\c\b\win_clang\src\sandbox\win\src\sync_dispatcher.cc(42,7):
warning: implicit conversion between pointer-to-function and
pointer-to-object is a Microsoft extension [-Wmicrosoft-cast]
This change fixes this warning in gtest, while hopefully not changing
any behavior. The change does two things:
1. It replaces the if in DefaultPrintTo with SFINAE
2. In C++11 mode, it uses enable_if<is_function<>> instead of
ImplicitlyConvertible<T*, const void*> to check if the
explicit cast is needed.
With this change, functions will use the branch with the reintpret_casts
with Visual Studio and clang/win, and clang no longer needs to warn
that it implicitly converts a function pointer to a void pointer.
2017-05-15 17:21:25 -04:00
Nico Weber
6c0c8a7ea5
Fixing typo in documentation.
...
This upstreams a Google-internal change.
2017-05-15 17:12:19 -04:00
Billy Donahue
294f72bc77
Merge pull request #725 from donhuff/xcode-headers
...
Add missing headers to Xcode framework target.
2017-05-15 11:44:37 -04:00
Billy Donahue
8c7f93feda
Merge pull request #1078 from pwnall/gtest_api_port
...
Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
2017-05-10 22:10:01 -04:00
Billy Donahue
887d569eb0
Merge pull request #965 from davidben/format-attr
...
Annotate ColoredPrintf with the format attribute and fix bugs.
2017-05-07 01:07:16 -04:00
Kamil Rytarowski
fac0dfbe73
Add NetBSD support
...
NetBSD is a modern UNIX-like Operating System.
Enable GTEST_HAS_PTHREAD and GTEST_HAS_DEATH_TEST on NetBSD.
2017-05-06 04:18:58 +02:00
Victor Costan
b7cf4414d9
Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.
...
This makes it possible for a port to define the specifier used for
exported symbols without having to change Google Test.
2017-05-04 10:19:47 -07:00
