eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,525 Commits 13 Branches 14 Tags 23 MiB
9bee111e03
Commit Graph

1525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
9bee111e03 Merge branch 'master' of https://github.com/google/googletest 2018-01-24 12:36:05 -05:00
Gennadiy Civil
c8ffb81dbc revert, lets get this compiled 2018-01-24 12:14:16 -05:00
Gennadiy Civil
72f0ea2a0a 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
bfd2406f79 Many code merge/upstream changes 2018-01-23 12:33:54 -05:00
Gennadiy Civil
370cdcdcba Merge branch 'master' into win-libcxx 2018-01-23 12:32:44 -05:00
Gennadiy Civil
97ebc2a1e8 Merge pull request #1417 from gennadiycivil/master 
merges, cl/155419551 and others
 2018-01-23 12:32:00 -05:00
Gennadiy Civil
38258f1099 Merge branch 'master' of https://github.com/google/googletest 2018-01-23 10:16:38 -05:00
Gennadiy Civil
84fcb3339a Merging, upstream http://cl/182836545 2018-01-23 10:15:28 -05:00
Gennadiy Civil
d54b4ce548 more code merge 2018-01-22 15:28:55 -05:00
Gennadiy Civil
325bdd33f3 merges, cl/155419551 and other 2018-01-22 15:20:19 -05:00
Gennadiy Civil
b5cf07f262 Merge pull request #1415 from gennadiycivil/master 
code merge
 2018-01-22 15:18:03 -05:00
Gennadiy Civil
c2c9847d5a more merging 2018-01-22 14:43:51 -05:00
Gennadiy Civil
3cd811bb4a merging 2018-01-22 14:14:05 -05:00
Gennadiy Civil
0e18369f97 code merge 2018-01-22 11:47:30 -05:00
Gennadiy Civil
00023d9fa8 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
7e2564f4cf Merge branch 'master' into support_xboxone 2018-01-18 17:42:34 -05:00
Gennadiy Civil
f2c8ff56a9 Merge branch 'master' into win-libcxx 2018-01-18 17:41:36 -05:00
Gennadiy Civil
ad25d31c03 Merge pull request #1412 from gennadiycivil/master 
Adding python tests to Bazel build file.
 2018-01-18 14:52:37 -05:00
Gennadiy Civil
67915e6edb Adding python tests to Bazel build file. 2018-01-18 14:32:31 -05:00
Gennadiy Civil
017dd4d37d Merge pull request #1407 from ted-xp/master 
Expose ScopedTrace utility in public interface
 2018-01-18 09:47:22 -05:00
Fedor Trushkin
60922662fe Use fully qualified in examples 2018-01-18 10:38:25 +01:00
Fedor Trushkin
920639122c Document ScopedTrace utility 2018-01-18 10:34:05 +01:00
Peter Collingbourne
4185169167 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
4e1156e10c Expose ScopedTrace utility in public interface 2018-01-17 16:41:59 +01:00
Gennadiy Civil
ffcabbd844 Merge pull request #1402 from gennadiycivil/master 
Code merging
 2018-01-15 18:48:35 -05:00
Gennadiy Civil
81b270392c Reverting some changes, need to make the merge compile 2018-01-15 18:16:11 -05:00
Gennadiy Civil
01e9531d3e Reverting some changes, need to make the merge compile 2018-01-15 17:39:33 -05:00
Gennadiy Civil
9faac7603b Reverting some changes, need to make the merge compile 2018-01-15 17:36:45 -05:00
Gennadiy Civil
a4e5067656 Reverting some changes, need to make the merge compile 2018-01-15 17:34:46 -05:00
Gennadiy Civil
8cd0c8c4da Test files for corresponding changes 2018-01-15 17:15:52 -05:00
Gennadiy Civil
3c6e143b62 Test files for corresponding changes 2018-01-15 16:59:57 -05:00
Gennadiy Civil
0508f6d082 Test files for corresponding changes 2018-01-15 16:56:17 -05:00
Gennadiy Civil
338c211250 Test files for corresponding changes 2018-01-15 16:46:16 -05:00
Gennadiy Civil
b47f3b370b Merge branch 'master' of github.com:gennadiycivil/googletest 2018-01-15 16:23:37 -05:00
Gennadiy Civil
c06b7f29cd More code merges 2018-01-15 16:23:23 -05:00
Gennadiy Civil
be4ac23eb5 Merge branch 'master' of https://github.com/google/googletest 2018-01-15 16:22:59 -05:00
Gennadiy Civil
96098b6ae6 Merge branch 'master' into master 2018-01-15 16:07:45 -05:00
Gennadiy Civil
153f625dd3 Code merging 2018-01-15 16:06:32 -05:00
Gennadiy Civil
f03a03f8c4 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
cdf810f53c Merge branch 'master' into fix-core-dump-shared 2018-01-13 15:06:57 -05:00
Gennadiy Civil
a5e0d37e6c Merge pull request #1400 from gennadiycivil/master 
Upstream/merge
 2018-01-12 21:47:26 -05:00
Gaspard Petit
f12d4da7ed Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone 2018-01-12 10:20:46 -05:00
gpetit
25a2ba9501 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 2018-01-12 10:20:26 -05:00
Gaspard Petit
83b9e72496 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone 2018-01-12 10:20:00 -05:00
gpetit
8c2e854f09 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne 2018-01-12 10:18:25 -05:00
Gennadiy Civil
9b205752b2 continue upstream/merge, etc 2018-01-11 17:36:34 -05:00
Gennadiy Civil
92d91cd443 Merge branch 'master' of https://github.com/google/googletest 2018-01-11 17:17:59 -05:00
Gennadiy Civil
c51d6cb4c8 Update .travis.yml 
Trying to get around mongoDB expired keys, etc
 2018-01-11 17:03:14 -05:00
Gennadiy Civil
92417645ac Update .travis.yml 2018-01-11 16:57:44 -05:00
Gennadiy Civil
00c177c196 Update .travis.yml 2018-01-11 16:55:21 -05:00