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
Gennadiy Civil
731dbc4a78
Merge pull request #1490 from gennadiycivil/master
...
merges-4
2018-03-05 14:17:40 -05:00
Gennadiy Civil
94d78ea14b
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 13:59:08 -05:00
Gennadiy Civil
8385928428
merges-3
2018-03-05 13:51:39 -05:00
Gennadiy Civil
c3a007f3cf
Merge pull request #1489 from gennadiycivil/master
...
Merges-2
2018-03-05 13:51:15 -05:00
Gennadiy Civil
73bf41299d
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 13:28:17 -05:00
Gennadiy Civil
dbf63e38a4
merges-2
2018-03-05 13:28:13 -05:00
Gennadiy Civil
a7ffeca974
Merge pull request #1488 from gennadiycivil/master
...
Merges
2018-03-05 13:21:59 -05:00
Gennadiy Civil
a518bd5cf2
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b
Merges-1
2018-03-05 12:26:15 -05:00
Gennadiy Civil
915c8d051d
Merge pull request #1477 from sgraham/unsigned-wchar
...
Try to handle unsigned wchar_t (arm) a bit better
2018-03-05 11:03:08 -05:00
Gennadiy Civil
829a8c966b
Merge branch 'master' into unsigned-wchar
2018-03-05 10:43:19 -05:00
Gennadiy Civil
6c73adfc03
Merge pull request #1486 from petrhosek/json-stacktrace
...
Use a full message in the JSON output for failures
2018-03-02 14:32:06 -05:00
Petr Hosek
7a2050d4d7
Use a full message in the JSON output for failures
...
The full message unlike summary also includes stack trace.
2018-03-01 13:19:34 -08:00
Gennadiy Civil
f8fbe1c821
Merge branch 'master' into unsigned-wchar
2018-03-01 11:18:17 -05:00
Gennadiy Civil
447d58b4ee
Merge pull request #1485 from coryan/parallelize-appveyor
...
Add options to parallelize builds.
2018-02-28 15:23:40 -05:00
Gennadiy Civil
18d270e335
Merge pull request #1479 from petrhosek/json
...
Support JSON output format in addition to XML
2018-02-28 14:50:35 -05:00
Gennadiy Civil
3817871beb
Merge branch 'master' into json
2018-02-28 14:39:17 -05:00
Carlos O'Ryan
3431b69909
Add options to parallelize builds.
...
AppVeyor build servers have two cores, so why not use them?
2018-02-28 11:28:57 -05:00
Gennadiy Civil
9557d29b7a
Merge pull request #1481 from dneto0/debug-postfix
...
Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
2018-02-28 08:55:39 -05:00
Gennadiy Civil
66d71756a7
Merge branch 'master' into debug-postfix
2018-02-28 08:43:57 -05:00
