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
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
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
