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
Conor Burgess
27bb844e5c
Merge branch 'master' into fix-argc
2018-01-12 16:00:39 +00: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
53c478d639b8eebd2942e88266610ebc79c541f6), define
GTEST_ATTRIBUTE_PRINTF_ in clang-cl too.
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 making behavior inconsistent with
other compilers.
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
Gennadiy Civil
8f90d46c8c
Merge branch 'master' into fix-argc
2017-12-08 11:55:08 -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
Conor Burgess
4d50715c2b
Fix location of _NSGetArgv correction.
2017-12-07 11:49:33 +00:00
Conor Burgess
ad383b274d
Fix value pointed to by _NSGetArgc() on macOS
2017-12-07 10:53:13 +00: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
Scott Slack-Smith
6c093a2391
Merge branch 'master' of https://github.com/google/googletest
2017-11-24 16:00:56 +00:00
Bryan Zimmerman
a7269e24ac
replaced back accidently removed static_cast with consistent ImplicitCast_
2017-11-22 09:41:32 -05:00
Tanzinul Islam
4ba3803f93
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
2017-11-19 20:17:46 +00: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
