Gennadiy Civil
|
7cced896a0
|
Remove Visual Studio 10,11,12 from build matrix
|
2018-01-25 09:58:51 -05:00 |
|
Gennadiy Civil
|
46ab9ecf1f
|
Merge pull request #1421 from gennadiycivil/master
upstream cl 182543808
|
2018-01-24 16:31:29 -05:00 |
|
Gennadiy Civil
|
b9651c04ef
|
placating gcc and its overzeauls size comparison warnings
|
2018-01-24 16:06:08 -05:00 |
|
Gennadiy Civil
|
264ba3e68e
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-24 14:59:43 -05:00 |
|
Gennadiy Civil
|
21cf836003
|
Merge pull request #1418 from gennadiycivil/master
Many code merge/upstream changes
|
2018-01-24 14:57:08 -05:00 |
|
Gennadiy Civil
|
e29805aa5d
|
upstream cl 182543808
|
2018-01-24 13:04:36 -05:00 |
|
Gennadiy Civil
|
7a2563a514
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-24 12:36:05 -05:00 |
|
Gennadiy Civil
|
06c3cce867
|
revert, lets get this compiled
|
2018-01-24 12:14:16 -05:00 |
|
Gennadiy Civil
|
ab9c44ccf0
|
Merge pull request #1410 from pcc/win-libcxx
Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
|
2018-01-24 12:07:16 -05:00 |
|
Gennadiy Civil
|
80defcec57
|
Many code merge/upstream changes
|
2018-01-23 12:33:54 -05:00 |
|
Gennadiy Civil
|
ad0146bfe2
|
Merge branch 'master' into win-libcxx
|
2018-01-23 12:32:44 -05:00 |
|
Gennadiy Civil
|
3c5e064ca0
|
Merge pull request #1417 from gennadiycivil/master
merges, cl/155419551 and others
|
2018-01-23 12:32:00 -05:00 |
|
Gennadiy Civil
|
58df576056
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-23 10:16:38 -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
|
83fa0cb17d
|
Merge pull request #1415 from gennadiycivil/master
code merge
|
2018-01-22 15:18:03 -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
|
62ba5d91d0
|
Merge pull request #1401 from eidosmontreal/support_xboxone
Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
|
2018-01-19 11:59:36 -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
|
051053054d
|
Merge pull request #1412 from gennadiycivil/master
Adding python tests to Bazel build file.
|
2018-01-18 14:52:37 -05:00 |
|
Gennadiy Civil
|
b1623e9144
|
Adding python tests to Bazel build file.
|
2018-01-18 14:32:31 -05:00 |
|
Gennadiy Civil
|
8d733dc195
|
Merge pull request #1407 from ted-xp/master
Expose ScopedTrace utility in public interface
|
2018-01-18 09:47:22 -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
|
1b077667bd
|
Merge pull request #1402 from gennadiycivil/master
Code merging
|
2018-01-15 18:48:35 -05: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
|
26085d7675
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-15 16:23:37 -05:00 |
|
Gennadiy Civil
|
d629744ec0
|
More code merges
|
2018-01-15 16:23:23 -05:00 |
|
Gennadiy Civil
|
6c86598805
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-15 16:22:59 -05:00 |
|
Gennadiy Civil
|
822c6201d3
|
Merge branch 'master' into master
|
2018-01-15 16:07:45 -05:00 |
|
Gennadiy Civil
|
da1f7fe1e7
|
Code merging
|
2018-01-15 16:06:32 -05:00 |
|
Gennadiy Civil
|
051fe2fa05
|
Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared
Fix double free when building Gtest/GMock in shared libraries and lin…
|
2018-01-15 15:37:20 -05:00 |
|
Gennadiy Civil
|
f6887b5cb9
|
Merge branch 'master' into fix-core-dump-shared
|
2018-01-13 15:06:57 -05:00 |
|
Gennadiy Civil
|
63ded6c27a
|
Merge pull request #1400 from gennadiycivil/master
Upstream/merge
|
2018-01-12 21:47:26 -05:00 |
|
Gaspard Petit
|
ea8f6f0e69
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:46 -05:00 |
|
gpetit
|
33d73d42b4
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:20:26 -05:00 |
|
Gaspard Petit
|
7ebbf59834
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:00 -05:00 |
|
gpetit
|
569d713a39
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:18:25 -05:00 |
|
Gennadiy Civil
|
93b77987f5
|
continue upstream/merge, etc
|
2018-01-11 17:36:34 -05:00 |
|
Gennadiy Civil
|
717d784ab2
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 17:17:59 -05:00 |
|
Gennadiy Civil
|
ed8d02cfc6
|
Update .travis.yml
Trying to get around mongoDB expired keys, etc
|
2018-01-11 17:03:14 -05:00 |
|
Gennadiy Civil
|
73d1251fe9
|
Update .travis.yml
|
2018-01-11 16:57:44 -05:00 |
|
Gennadiy Civil
|
cfd29e0488
|
Update .travis.yml
|
2018-01-11 16:55:21 -05:00 |
|
Gennadiy Civil
|
29f94e0106
|
Update .travis.yml
|
2018-01-11 14:57:50 -05:00 |
|
Gennadiy Civil
|
2982dc1a58
|
Trying to fix travis
|
2018-01-11 14:57:20 -05:00 |
|
Gennadiy Civil
|
13218917c8
|
Merge pull request #1399 from gennadiycivil/master
Merging, Upstream cl 103120214
|
2018-01-11 14:26:47 -05:00 |
|
Gennadiy Civil
|
5add34775c
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 11:31:37 -05:00 |
|
Gennadiy Civil
|
6914ae2394
|
Upstream cl 103120214
|
2018-01-11 11:31:23 -05:00 |
|
Gennadiy Civil
|
836c419c0d
|
Merge pull request #1398 from gennadiycivil/master
more cleanup
|
2018-01-11 11:30:51 -05:00 |
|
Gennadiy Civil
|
1d757db65c
|
More merge, cleanup
|
2018-01-10 16:49:20 -05:00 |
|
Gennadiy Civil
|
b44ed21905
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 16:46:21 -05:00 |
|
Gennadiy Civil
|
481fe9446a
|
More merge, cleanup
|
2018-01-10 16:45:59 -05:00 |
|
Gennadiy Civil
|
cac5d7ce1a
|
Merge pull request #1397 from gennadiycivil/master
Code Merge, upsteam of accumulated changes, cleanup
|
2018-01-10 16:09:23 -05:00 |
|
Gennadiy Civil
|
84aa45941f
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 14:42:37 -05:00 |
|
Gennadiy Civil
|
6a26e47cfc
|
Code merge, upstreaming accumulated changes, cleanup
|
2018-01-10 14:42:29 -05:00 |
|
Gennadiy Civil
|
d7196896bb
|
Merge pull request #1396 from gennadiycivil/master
small cleanup/,merge
|
2018-01-10 14:35:21 -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
|
6efe104aed
|
Merge pull request #1395 from gennadiycivil/master
code merge, cleanups
|
2018-01-10 11:59:44 -05:00 |
|
Gennadiy Civil
|
f33902b97a
|
revert googletest/test/gtest-param-test_test.cc
|
2018-01-10 11:04:49 -05:00 |
|
Gennadiy Civil
|
f729a2867e
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-10 10:57:37 -05:00 |
|
Gennadiy Civil
|
8034001188
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 10:57:21 -05:00 |
|
Gennadiy Civil
|
505de1d6e2
|
Merge branch 'master' into master
|
2018-01-10 10:42:25 -05:00 |
|
Gennadiy Civil
|
6eccdb7b62
|
Update .travis.yml
|
2018-01-10 10:20:09 -05:00 |
|
Gennadiy Civil
|
2f31bfab6b
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-09 22:47:12 -05:00 |
|
Gennadiy Civil
|
d237297ceb
|
code merge, cleanups
|
2018-01-09 22:46:17 -05:00 |
|
Gennadiy Civil
|
509e78be23
|
Merge pull request #1394 from gennadiycivil/master
wip, cleanups/merge
|
2018-01-09 20:22:14 -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 |
|
Gaspard Petit
|
5d96565ccc
|
Merge branch 'master' into support_xboxone
|
2018-01-09 15:22:30 -05:00 |
|
Gennadiy Civil
|
9fce984a67
|
wip, cleanups/merge
|
2018-01-09 14:48:06 -05:00 |
|
Gennadiy Civil
|
2301524923
|
Merge pull request #1393 from gennadiycivil/master
cleanup, merge
|
2018-01-09 14:45:55 -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 |
|
Gennadiy Civil
|
0e6da4cead
|
Merge branch 'master' into fix-core-dump-shared
|
2018-01-09 00:22:32 -05:00 |
|
Gennadiy Civil
|
e194f52114
|
Merge pull request #1388 from rongjiecomputer/bazel
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
|
2018-01-08 22:07:26 -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
|
c3bb0ee2a6
|
Merge pull request #1390 from gennadiycivil/master
Small cleanups, merge
|
2018-01-08 17:10:16 -05:00 |
|
Gennadiy Civil
|
91ba05cc36
|
Small cleanups, merge
|
2018-01-08 16:14:06 -05:00 |
|
Gennadiy Civil
|
3d27bdef53
|
Merge pull request #1387 from coryan/optimize-build-matrix-ready
Optimize build matrix on pull requests
|
2018-01-08 10:50:13 -05:00 |
|
Gennadiy Civil
|
4371b996ed
|
Merge pull request #1385 from gennadiycivil/master
code cleanup in preparation for merges, cl 180857299
|
2018-01-06 00:02:40 -05:00 |
|
Gennadiy Civil
|
fab06101d7
|
Merge branch 'master' into master
|
2018-01-05 15:34:07 -05:00 |
|
Carlos O'Ryan
|
67d6e46728
|
Use correct name for build event types.
|
2018-01-05 14:58:48 -05:00 |
|
Gennadiy Civil
|
67476c1426
|
Revert one file for now
|
2018-01-05 12:35:41 -05:00 |
|
Carlos O'Ryan
|
adfdc65ca7
|
Fixed test for pull request.
|
2018-01-05 11:01:37 -05:00 |
|
Gennadiy Civil
|
5b26b0fce7
|
Merge pull request #1007 from davidben/missing-declarations
Pass the -Wmissing-declarations warning.
|
2018-01-05 10:18:26 -05:00 |
|
Carlos O'Ryan
|
d3acb4ba18
|
Fixed output and test for 'enabled_on_pr'
|
2018-01-05 09:32:50 -05:00 |
|