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
09a0e17c6a
Merge pull request #1525 from gennadiycivil/master
...
merging gtest-port, 2
2018-03-29 10:24:19 -04: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
9dde7c4e8c
Merge pull request #1518 from gennadiycivil/master
...
merging gtest-port 1 of N
2018-03-27 15:39:32 -04:00
Gennadiy Civil
aea6fc32aa
merging gtest-port 1 of N
2018-03-27 15:19:40 -04:00
Gennadiy Civil
cafa9e5228
Merge pull request #1515 from gennadiycivil/master
...
merges
2018-03-26 14:10:38 -04:00
Gennadiy Civil
a75a5c9706
merges 1
2018-03-26 13:14:00 -04:00
Gennadiy Civil
a0e2faf480
Merge branch 'master' of https://github.com/google/googletest
2018-03-26 13:04:34 -04:00
Gennadiy Civil
3df7cbe6f7
merges, gtest
2018-03-26 13:04:28 -04:00
Gennadiy Civil
78579756a8
Merge pull request #1512 from gennadiycivil/master
...
merges, gmock - 1
2018-03-26 11:19:10 -04:00
Gennadiy Civil
6aae206bc2
merging gmock-matchers.h 3
2018-03-26 10:36:26 -04:00
Gennadiy Civil
23187058e7
merging gmock-matchers.h 2
2018-03-26 10:16:59 -04:00
Gennadiy Civil
8ea10d3878
Upstreaming FloatingEq2Matcher,
2018-03-26 09:28:16 -04:00
Gennadiy Civil
b907c26740
Merging gmock-matchers.h -2
2018-03-23 11:42:41 -04:00
Gennadiy Civil
466a49ae30
gmock-matchers merging -2
2018-03-23 11:23:54 -04:00
Gennadiy Civil
a28a7eb5e9
Merge branch 'master' of https://github.com/google/googletest
2018-03-22 16:24:51 -04:00
Gennadiy Civil
dfa853b63d
Merge pull request #1510 from gennadiycivil/master
...
More merges, restruct some
2018-03-22 16:21:26 -04:00
Gennadiy Civil
b7c568326c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Gennadiy Civil
a1692ed133
Merge branch 'master' into master
2018-03-22 12:56:01 -04:00
Gennadiy Civil
4e89c76db8
reverting gtest_list_tests_unittest.py
2018-03-22 12:37:38 -04:00
Gennadiy Civil
eaaa422c52
Update appveyor.yml
2018-03-22 11:48:21 -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
dccc2d6754
Merge pull request #1508 from gennadiycivil/master
...
merge, again, IsRecursiveContainer
2018-03-19 13:32:25 -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
a325ad2db5
Merge pull request #1504 from gennadiycivil/master
...
Merges
2018-03-14 11:21:53 -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
Gennadiy Civil
f35fe6de3b
Merge pull request #1503 from sheepmaster/upstream_188748737
...
Allow macros inside of parametrized test names.
2018-03-12 15:04:50 -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
Gennadiy Civil
abc6e943e0
Merge pull request #1502 from gennadiycivil/master
...
merges-port(1)
2018-03-12 12:39:13 -04:00
Gennadiy Civil
cf9d6344d2
merges-port(1)
2018-03-12 11:51:44 -04:00
Gennadiy Civil
9bda90b7e5
Merge pull request #1497 from gennadiycivil/master
...
Merging, XML tests
2018-03-07 16:14:48 -05:00
Gennadiy Civil
e891900666
Merging, XML tests
2018-03-07 15:57:55 -05:00
Gennadiy Civil
703b4a85a2
Merge pull request #1493 from gennadiycivil/master
...
merges-8
2018-03-05 16:15:02 -05:00
Gennadiy Civil
89d6f70f34
merges-8
2018-03-05 15:53:36 -05:00
Gennadiy Civil
617e2c5615
Merge pull request #1492 from gennadiycivil/master
...
merges-7
2018-03-05 15:52:38 -05:00
Gennadiy Civil
995a9dfa69
merges-7
2018-03-05 15:21:48 -05:00
Gennadiy Civil
ae4480f923
Merge pull request #1491 from gennadiycivil/master
...
merges-6
2018-03-05 14:41:37 -05:00
Gennadiy Civil
086825de5d
merges-6
2018-03-05 14:21:41 -05:00
