Gennadiy Civil
c13ab6003b
merging
2018-04-11 13:20:36 -04:00
Gennadiy Civil
6f9db26159
merging
2018-04-10 16:34:21 -04:00
Gennadiy Civil
9bc82ce725
merging
2018-04-10 16:22:50 -04:00
Gennadiy Civil
39c58da187
merge
2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
2018-04-10 15:57:16 -04:00
Gennadiy Civil
ca54b67303
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
c1d4c34233
this should be it
2018-04-09 16:13:45 -04:00
Gennadiy Civil
f5871009e6
yet more
2018-04-09 16:04:48 -04:00
Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
57d6e824b4
more
2018-04-09 15:33:56 -04:00
Gennadiy Civil
cb13dc759c
more warnings
2018-04-06 11:26:12 -04:00
Gennadiy Civil
d9f3611a22
more MSVC warnings
2018-04-06 11:17:45 -04:00
Gennadiy Civil
fbe3c94533
Merge branch 'master' into fix_locale_win
2018-04-04 13:58:55 -04:00
fo40225
a0c27bd8a5
fix build break on locale windows
2018-04-04 23:16:16 +08:00
Gennadiy Civil
1776ed8c1e
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
2018-04-04 11:06:09 -04:00
Gennadiy Civil
98687b7847
Merge branch 'master' into int3
2018-04-03 16:31:59 -04:00
Gennadiy Civil
18be012457
Merge branch 'master' into int3
2018-04-03 16:27:32 -04:00
Gennadiy Civil
d52aaee8eb
Upstreaming, cl 191344765
2018-04-03 16:14:35 -04:00
Gennadiy Civil
27507429cb
Merge branch 'master' into int3
2018-04-03 11:44:23 -04:00
Gennadiy Civil
a2dd136578
merging port, cont. 191443078
2018-04-03 11:38:30 -04:00
Gennadiy Civil
aa349acb07
merging, cont - 2
2018-04-03 11:23:54 -04:00
Gennadiy Civil
2cedd5b9c1
merging gtest-port.h , 191439094
2018-04-03 11:06:20 -04:00
Gennadiy Civil
04d1e56bd2
merging, just comments format
2018-04-03 09:56:23 -04:00
Gennadiy Civil
5beb452bbe
testing, merge
2018-04-03 09:45:49 -04:00
Gennadiy Civil
df5a48da03
Testing, gtest-port.h merge
2018-04-03 09:31:10 -04:00
Gennadiy Civil
87a4cdddd0
merging gtest-port.h, again - 1
2018-04-02 14:22:24 -04:00
Roland Leißa
b1d18b85bd
Merge branch 'master' into int3
2018-03-30 03:16:20 +02:00
Gennadiy Civil
b2373c6f51
Revert "merging gtest-port 1 of N"
2018-03-29 13:28:29 -04:00
Gennadiy Civil
54bb165ffd
Revert "merging gtest-port, 2"
2018-03-29 13:27:11 -04:00
Roland Leißa
e10ea42274
Merge remote-tracking branch 'google/master' into int3
2018-03-29 16:39:40 +02:00
Roland Leißa
d04bf07fad
typo
2018-03-29 16:38:23 +02:00
Gennadiy Civil
8e0364a37b
merging gtest-port, 2
2018-03-29 09:46:13 -04:00
Roland Leißa
11855d8ef0
provide alternative for DebugBreak()
...
This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
2018-03-28 23:45:51 +02:00
Gennadiy Civil
aea6fc32aa
merging gtest-port 1 of N
2018-03-27 15:19:40 -04:00
Gennadiy Civil
a75a5c9706
merges 1
2018-03-26 13:14:00 -04:00
Gennadiy Civil
3df7cbe6f7
merges, gtest
2018-03-26 13:04:28 -04:00
Gennadiy Civil
4e89c76db8
reverting gtest_list_tests_unittest.py
2018-03-22 12:37:38 -04:00
Gennadiy Civil
da71e8c870
more merges
2018-03-22 10:58:18 -04:00
Gennadiy Civil
0f6567954f
more merges
2018-03-22 10:56:35 -04:00
Gennadiy Civil
691e38e518
More merges
2018-03-21 16:31:31 -04:00
Gennadiy Civil
a3c2e107ae
cl 189032107, again
2018-03-16 15:56:31 -04:00
Gennadiy Civil
080fcbe0aa
cl 189032107
2018-03-16 13:36:36 -04:00
Gennadiy Civil
a178cc7ef7
merge, again, IsRecursiveContainer
2018-03-15 14:31:37 -04:00
Gennadiy Civil
262aaf2f1d
erging, cont
2018-03-14 10:49:18 -04:00
Gennadiy Civil
2814b4b089
merging, merging
2018-03-13 16:02:05 -04:00
Gennadiy Civil
a719320a3c
fixing, was removing too much
2018-03-13 11:53:27 -04:00
Gennadiy Civil
5461f63d01
Merge branch 'master' of https://github.com/google/googletest
2018-03-13 11:13:58 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Bernhard Bauer
fc437ef4b2
Merge branch 'master' into upstream_188748737
2018-03-12 18:15:35 +00:00
Bernhard Bauer
7b70413e0c
Allow macros inside of parametrized test names.
...
This allows doing things like TEST_P(TestFixture, MAYBE(TestName))
for nicer conditional test disabling.
Upstream of cr/188748737.
Tested:
Added unit tests MacroNamingTest and MacroNamingTestNonParametrized.
2018-03-12 18:14:06 +00:00
