Gennadiy Civil
|
d1ce051947
|
Merge pull request #1537 from gennadiycivil/master
gtest-port.h merge
|
2018-04-03 10:09:08 -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
|
543e387114
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 09:31:49 -04:00 |
|
Gennadiy Civil
|
c300e3085b
|
Testing, gtest-port.h merge
|
2018-04-03 09:31:10 -04:00 |
|
Gennadiy Civil
|
857d402550
|
Merge pull request #1534 from gennadiycivil/master
merging gtest-port.h, again - 1
|
2018-04-02 16:03:22 -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
|
a0dd1a237a
|
Include OSX builds back into PR builds
Had an instance where the breakage was not detected until the actual merge. Need to be better than that
|
2018-03-29 13:50:32 -04:00 |
|
Gennadiy Civil
|
5637af0d68
|
Merge pull request #1527 from google/revert-1518-master
Revert "merging gtest-port 1 of N"
|
2018-03-29 13:28:47 -04:00 |
|
Gennadiy Civil
|
73996ca508
|
Revert "merging gtest-port 1 of N"
|
2018-03-29 13:28:29 -04:00 |
|
Gennadiy Civil
|
034db5c75e
|
Merge pull request #1526 from google/revert-1525-master
Revert "merging gtest-port, 2"
|
2018-03-29 13:28:04 -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
|
60fb62367a
|
Merge pull request #1525 from gennadiycivil/master
merging gtest-port, 2
|
2018-03-29 10:24:19 -04: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
|
08d852bf71
|
Merge pull request #1518 from gennadiycivil/master
merging gtest-port 1 of N
|
2018-03-27 15:39:32 -04:00 |
|
Gennadiy Civil
|
a81411ca4d
|
merging gtest-port 1 of N
|
2018-03-27 15:19:40 -04:00 |
|
Gennadiy Civil
|
2f3af4f923
|
Merge pull request #1515 from gennadiycivil/master
merges
|
2018-03-26 14:10:38 -04:00 |
|
Gennadiy Civil
|
09e4f71b65
|
merges 1
|
2018-03-26 13:14:00 -04:00 |
|
Gennadiy Civil
|
5da5653e76
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-03-26 13:04:34 -04:00 |
|
Gennadiy Civil
|
b7e7102bb3
|
merges, gtest
|
2018-03-26 13:04:28 -04:00 |
|
Gennadiy Civil
|
2a46378fbb
|
Merge pull request #1512 from gennadiycivil/master
merges, gmock - 1
|
2018-03-26 11:19:10 -04:00 |
|
Gennadiy Civil
|
7c7ab001c1
|
merging gmock-matchers.h 3
|
2018-03-26 10:36:26 -04:00 |
|
Gennadiy Civil
|
0eff246cb1
|
merging gmock-matchers.h 2
|
2018-03-26 10:16:59 -04:00 |
|
Gennadiy Civil
|
20d30a8614
|
Upstreaming FloatingEq2Matcher,
|
2018-03-26 09:28:16 -04:00 |
|
Gennadiy Civil
|
401b056442
|
Merging gmock-matchers.h -2
|
2018-03-23 11:42:41 -04:00 |
|
Gennadiy Civil
|
c4727169c2
|
gmock-matchers merging -2
|
2018-03-23 11:23:54 -04:00 |
|
Gennadiy Civil
|
5ee6c8a927
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-03-22 16:24:51 -04:00 |
|
Gennadiy Civil
|
f6276811a5
|
Merge pull request #1510 from gennadiycivil/master
More merges, restruct some
|
2018-03-22 16:21:26 -04:00 |
|
Gennadiy Civil
|
7b1726ef5c
|
merging, gmock -1
|
2018-03-22 15:35:37 -04:00 |
|
Gennadiy Civil
|
f30bb60a7b
|
Merge branch 'master' into master
|
2018-03-22 12:56:01 -04:00 |
|
Gennadiy Civil
|
685635069f
|
reverting gtest_list_tests_unittest.py
|
2018-03-22 12:37:38 -04:00 |
|
Gennadiy Civil
|
202f59af0f
|
Update appveyor.yml
|
2018-03-22 11:48:21 -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
|
49cfbc408b
|
Merge pull request #1508 from gennadiycivil/master
merge, again, IsRecursiveContainer
|
2018-03-19 13:32:25 -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
|
00b6ba1ca4
|
Merge pull request #1504 from gennadiycivil/master
Merges
|
2018-03-14 11:21:53 -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 |
|
Gennadiy Civil
|
851bd65ed9
|
Merge pull request #1503 from sheepmaster/upstream_188748737
Allow macros inside of parametrized test names.
|
2018-03-12 15:04:50 -04:00 |
|