eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,946 Commits 13 Branches 14 Tags
Commit Graph

488 Commits

Author SHA1 Message Date
fo40225
be6dfba167 fix build break on locale windows 2018-04-04 23:16:16 +08:00
Gennadiy Civil
a36f3d1e6a Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl 2018-04-04 11:06:09 -04:00
Gennadiy Civil
34e82f9eb5 Merge branch 'master' into int3 2018-04-03 16:31:59 -04:00
Gennadiy Civil
bd6296d44c Merge branch 'master' into int3 2018-04-03 16:27:32 -04:00
Gennadiy Civil
fdc03e450a Upstreaming, cl 191344765 2018-04-03 16:14:35 -04:00
Gennadiy Civil
06f96276f6 Merge branch 'master' into int3 2018-04-03 11:44:23 -04:00
Gennadiy Civil
f7e1b4f330 merging port, cont. 191443078 2018-04-03 11:38:30 -04:00
Gennadiy Civil
ffcd94d903 merging, cont - 2 2018-04-03 11:23:54 -04:00
Gennadiy Civil
5539444c20 merging gtest-port.h , 191439094 2018-04-03 11:06:20 -04:00
Gennadiy Civil
4534287cb6 merging, just comments format 2018-04-03 09:56:23 -04:00
Gennadiy Civil
98f4d5db7a testing, merge 2018-04-03 09:45:49 -04:00
Gennadiy Civil
c300e3085b Testing, gtest-port.h merge 2018-04-03 09:31:10 -04:00
Gennadiy Civil
b4d1bd371d merging gtest-port.h, again - 1 2018-04-02 14:22:24 -04:00
Roland Leißa
8f7e029803 Merge branch 'master' into int3 2018-03-30 03:16:20 +02:00
Gennadiy Civil
73996ca508 Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00
Gennadiy Civil
148ec8fb4e Revert "merging gtest-port, 2" 2018-03-29 13:27:11 -04:00
Roland Leißa
6eed4f687b Merge remote-tracking branch 'google/master' into int3 2018-03-29 16:39:40 +02:00
Roland Leißa
4581b9eb35 typo 2018-03-29 16:38:23 +02:00
Gennadiy Civil
be841c6ed1 merging gtest-port, 2 2018-03-29 09:46:13 -04:00
Roland Leißa
d0c03cc388 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
a81411ca4d merging gtest-port 1 of N 2018-03-27 15:19:40 -04:00
Gennadiy Civil
09e4f71b65 merges 1 2018-03-26 13:14:00 -04:00
Gennadiy Civil
b7e7102bb3 merges, gtest 2018-03-26 13:04:28 -04:00
Gennadiy Civil
685635069f reverting gtest_list_tests_unittest.py 2018-03-22 12:37:38 -04:00
Gennadiy Civil
d12860c513 more merges 2018-03-22 10:58:18 -04:00
Gennadiy Civil
8dcfeca51f more merges 2018-03-22 10:56:35 -04:00
Gennadiy Civil
bc73e93ea5 More merges 2018-03-21 16:31:31 -04:00
Gennadiy Civil
dd2cc36420 cl 189032107, again 2018-03-16 15:56:31 -04:00
Gennadiy Civil
67efdc1fc7 cl 189032107 2018-03-16 13:36:36 -04:00
Gennadiy Civil
78eb71c7e3 merge, again, IsRecursiveContainer 2018-03-15 14:31:37 -04:00
Gennadiy Civil
ab8042e409 erging, cont 2018-03-14 10:49:18 -04:00
Gennadiy Civil
5c87ce09b5 merging, merging 2018-03-13 16:02:05 -04:00
Gennadiy Civil
6aaae39fdc fixing, was removing too much 2018-03-13 11:53:27 -04:00
Gennadiy Civil
033c81bd1f Merge branch 'master' of https://github.com/google/googletest 2018-03-13 11:13:58 -04:00
Gennadiy Civil
92be48af66 More merges, removing old dead code 2018-03-13 11:13:37 -04:00
Bernhard Bauer
77965a7da1 Merge branch 'master' into upstream_188748737 2018-03-12 18:15:35 +00:00
Bernhard Bauer
cb2dd89007 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
2cb5677ab7 merges-port(1) 2018-03-12 11:51:44 -04:00
Gennadiy Civil
744688e8bc Merging, XML tests 2018-03-07 15:57:55 -05:00
Gennadiy Civil
7ee36bdbea merges-8 2018-03-05 15:53:36 -05:00
Gennadiy Civil
23d6041c40 merges-7 2018-03-05 15:21:48 -05:00
Gennadiy Civil
b39f4ff8d0 merges-6 2018-03-05 14:21:41 -05:00
Gennadiy Civil
193af9ad36 merges-3 2018-03-05 13:51:39 -05:00
Gennadiy Civil
0a27876dd3 Merge branch 'master' of https://github.com/google/googletest 2018-03-05 12:26:24 -05:00
Gennadiy Civil
78797f38ef Merges-1 2018-03-05 12:26:15 -05:00
Petr Hosek
1c8ca09f01 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
66a9a65a50 Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Gennadiy Civil
2a94665b0b Merge branch 'master' into debug-postfix 2018-02-28 08:43:57 -05:00
Petr Hosek
e95050f496 Support JSON output format in addition to XML 
This change allows emitting output in JSON format in addition to the
already supported XML format. The implementation as well as the file
structure is intentionally modelled after the XML one.
 2018-02-28 00:48:41 -08:00
Gennadiy Civil
80cd2a3c67 Merge pull request #1423 from pcc/win-libcxx2 
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
 2018-02-27 14:00:29 -05:00