Commit Graph

  • bb7a018348 reverting, test Gennadiy Civil 2018-04-19 11:28:46 -04:00
  • 7b4ee66f5f reverting just to test Gennadiy Civil 2018-04-19 11:14:17 -04:00
  • 62a7c140a7 testing Gennadiy Civil 2018-04-19 10:19:59 -04:00
  • 2d3024f5bd Fix friend declaration to use GTEST_API_ decl spec. David Sunderland 2018-04-19 01:11:50 -04:00
  • b2f97ab317 Revert useless use of GTEST_API_ on WithoutMatchers decl. David Sunderland 2018-04-19 01:10:22 -04:00
  • 1c79ad7a56 Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem on MSVC? David Sunderland 2018-04-18 20:59:49 -04:00
  • d5725da968 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. David Sunderland 2018-04-18 20:25:31 -04:00
  • 7878b27ddd Merge branch 'parameterless' of https://github.com/dnsunderland/googletest into parameterless David Sunderland 2018-04-18 19:39:39 -04:00
  • f6551f2d45 Don't use generalized initializer list; is C++11 extension. David Sunderland 2018-04-18 19:37:33 -04:00
  • 08cb06b197
    Merge branch 'master' into parameterless dnsunderland 2018-04-18 16:32:31 -07:00
  • f437f8ca0d Clone of unsubmitted cr/176529515. Introduce parameterless expectations. David Sunderland 2018-04-18 19:28:56 -04:00
  • f312435032 more typos Gennadiy Civil 2018-04-18 17:13:23 -04:00
  • a0fd742639 msvc Gennadiy Civil 2018-04-18 17:03:42 -04:00
  • b00e281078 more typos Gennadiy Civil 2018-04-18 16:43:11 -04:00
  • 881ee307a7 typo Gennadiy Civil 2018-04-18 15:18:03 -04:00
  • 10e8ec2714 move only types docs Gennadiy Civil 2018-04-18 15:10:07 -04:00
  • 4d554c391b typo Gennadiy Civil 2018-04-18 15:02:47 -04:00
  • b4cbf531e9 typo Gennadiy Civil 2018-04-18 14:25:58 -04:00
  • 78d73814fa http://cl/193386206 Gennadiy Civil 2018-04-18 14:21:28 -04:00
  • a48b95ef81 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-18 11:05:12 -04:00
  • c56ba73a23 merge, explicit, ( should be it) Gennadiy Civil 2018-04-18 11:05:00 -04:00
  • 4bd8c4638a
    Merge pull request #1579 from gennadiycivil/master Gennadiy Civil 2018-04-18 10:57:04 -04:00
  • 88311784e4 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-18 10:36:24 -04:00
  • 4707c0ffd4 193353312 Gennadiy Civil 2018-04-18 10:36:12 -04:00
  • 4035d6ecc0
    Merge pull request #1577 from gennadiycivil/master Gennadiy Civil 2018-04-17 19:44:13 -04:00
  • 80d6e26a9c cl/193060888 Gennadiy Civil 2018-04-17 19:32:15 -04:00
  • 5dccf6b79e http://cl/193060888 Gennadiy Civil 2018-04-17 16:22:35 -04:00
  • dff32aff97 http://cl/193060888 Gennadiy Civil 2018-04-17 16:12:04 -04:00
  • 3f88bb1831 test-meerging Gennadiy Civil 2018-04-16 15:52:47 -04:00
  • ec425d7160 typo Gennadiy Civil 2018-04-16 12:00:37 -04:00
  • e4ab316c85 more msvc Gennadiy Civil 2018-04-16 11:52:22 -04:00
  • 1944bc0f51 typo Gennadiy Civil 2018-04-16 11:41:36 -04:00
  • e9eff488f9 msvc warnings Gennadiy Civil 2018-04-16 11:32:16 -04:00
  • bd2a1aed03 merging gmock generated matchers Gennadiy Civil 2018-04-16 11:18:49 -04:00
  • 1f605414cc
    Merge pull request #1576 from gennadiycivil/master Gennadiy Civil 2018-04-16 11:02:12 -04:00
  • 9fba103156 merging, testing, this should be it Gennadiy Civil 2018-04-16 10:42:08 -04:00
  • 1c6e68cf6c merging Gennadiy Civil 2018-04-16 10:34:07 -04:00
  • 26c10dc7e6 merging Gennadiy Civil 2018-04-16 10:16:48 -04:00
  • 247ded3236
    Merge pull request #1571 from gennadiycivil/master Gennadiy Civil 2018-04-14 19:24:19 -04:00
  • d84eb86df5 more pizza Gennadiy Civil 2018-04-13 16:04:34 -04:00
  • f45728a5ac more OSX pizzas Gennadiy Civil 2018-04-13 15:48:57 -04:00
  • b74a1af00f osx pizzas Gennadiy Civil 2018-04-13 11:49:37 -04:00
  • f9bd6180de merging gmock actions test Gennadiy Civil 2018-04-13 11:02:55 -04:00
  • 0bfa823785 merging, gmock actions test Gennadiy Civil 2018-04-13 11:02:25 -04:00
  • 38de61d73b
    Merge pull request #1569 from gennadiycivil/master Gennadiy Civil 2018-04-13 09:41:33 -04:00
  • 6d31084797 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-13 09:16:56 -04:00
  • 2dc576ec55 merging Gennadiy Civil 2018-04-13 09:16:40 -04:00
  • 0957cce368
    Merge pull request #1568 from gennadiycivil/master Gennadiy Civil 2018-04-12 18:56:57 -04:00
  • f7330f9f14 more fixing osx libstd++ bugs Gennadiy Civil 2018-04-12 17:00:31 -04:00
  • 65380492b2 fixing Gennadiy Civil 2018-04-12 16:32:03 -04:00
  • dc4f5638c2 merging, fix OSX issue Gennadiy Civil 2018-04-12 15:45:21 -04:00
  • 092ca91072 merging Gennadiy Civil 2018-04-12 14:46:57 -04:00
  • 6fb65b8215
    Merge pull request #1567 from gennadiycivil/master Gennadiy Civil 2018-04-12 14:41:48 -04:00
  • a79851f2c2 merging Gennadiy Civil 2018-04-12 14:00:38 -04:00
  • 3ccd6e3809
    Merge pull request #1566 from gennadiycivil/master Gennadiy Civil 2018-04-12 13:55:37 -04:00
  • fa658e0cc0 merging Gennadiy Civil 2018-04-12 13:42:47 -04:00
  • 531e29485c
    Merge pull request #1562 from gennadiycivil/master Gennadiy Civil 2018-04-12 11:45:40 -04:00
  • c67f51b5dc msvc Gennadiy Civil 2018-04-12 11:32:17 -04:00
  • 9b5940e040 revert this one Gennadiy Civil 2018-04-12 10:28:02 -04:00
  • b2d81b4fb2 merge, ... gmock-matchers test Gennadiy Civil 2018-04-12 09:45:07 -04:00
  • 07f3bdd4c9 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-12 09:13:38 -04:00
  • b640d8743d
    Merge pull request #1557 from pwnall/gmock-fix-ub Gennadiy Civil 2018-04-12 09:13:11 -04:00
  • 854adb087b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-12 09:12:15 -04:00
  • e77deb29a6 small cleanup Gennadiy Civil 2018-04-12 09:12:02 -04:00
  • 1324e2d706 Remove multiple inheritance from "unintesting call" mock classes. Victor Costan 2018-04-09 21:57:54 -07:00
  • fdb57f8571
    Merge pull request #1561 from gennadiycivil/master Gennadiy Civil 2018-04-11 16:06:23 -04:00
  • 373481c5a9 ...merging Gennadiy Civil 2018-04-11 15:46:57 -04:00
  • ef17a9f98a Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 15:38:25 -04:00
  • 6273647250
    Merge pull request #1560 from gennadiycivil/master Gennadiy Civil 2018-04-11 15:38:15 -04:00
  • 8654c1ca10 merging Gennadiy Civil 2018-04-11 15:33:31 -04:00
  • af4cfd5088 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 15:24:25 -04:00
  • ab84d14281 Upstream cl/192179348 Gennadiy Civil 2018-04-11 15:24:04 -04:00
  • b4429c9219
    Merge pull request #1559 from gennadiycivil/master Gennadiy Civil 2018-04-11 13:57:33 -04:00
  • 106e731e68 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 13:20:55 -04:00
  • c13ab6003b merging Gennadiy Civil 2018-04-11 13:20:36 -04:00
  • d5988e7dd0
    Merge pull request #1558 from gennadiycivil/master Gennadiy Civil 2018-04-11 10:22:10 -04:00
  • 5cd213ea5e ..and this should be it Gennadiy Civil 2018-04-11 10:10:24 -04:00
  • 6a7573a7de more Gennadiy Civil 2018-04-11 09:55:36 -04:00
  • 039d9b54c2 pizza work, cont Gennadiy Civil 2018-04-11 09:47:38 -04:00
  • f15fd9610b osx pizzas, cont Gennadiy Civil 2018-04-11 09:33:51 -04:00
  • b15be9a819 fixing osx pizza Gennadiy Civil 2018-04-11 09:20:48 -04:00
  • 6f9db26159 merging Gennadiy Civil 2018-04-10 16:34:21 -04:00
  • 9bc82ce725 merging Gennadiy Civil 2018-04-10 16:22:50 -04:00
  • 25d8176e4f merging Gennadiy Civil 2018-04-10 16:18:23 -04:00
  • 39c58da187 merge Gennadiy Civil 2018-04-10 16:10:34 -04:00
  • e1071eb949 RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR Gennadiy Civil 2018-04-10 15:57:16 -04:00
  • 8fbb419470
    Include gcc on mac into PR matrix Gennadiy Civil 2018-04-10 11:28:16 -04:00
  • a072611118
    Merge pull request #1556 from google/revert-1551-master Gennadiy Civil 2018-04-09 22:37:50 -04:00
  • ca54b67303
    Revert "gmock actions 2" Gennadiy Civil 2018-04-09 22:10:12 -04:00
  • 7f03f7ceae
    Merge pull request #1551 from gennadiycivil/master Gennadiy Civil 2018-04-09 16:34:54 -04:00
  • 64d24b810f ... and this Gennadiy Civil 2018-04-09 16:24:30 -04:00
  • c1d4c34233 this should be it Gennadiy Civil 2018-04-09 16:13:45 -04:00
  • f5871009e6 yet more Gennadiy Civil 2018-04-09 16:04:48 -04:00
  • 05b5a53898 formatting Gennadiy Civil 2018-04-09 15:50:19 -04:00
  • 2de24fbf7a tuning Gennadiy Civil 2018-04-09 15:39:12 -04:00
  • 055f32199a tuning Gennadiy Civil 2018-04-09 15:38:38 -04:00
  • 57d6e824b4 more Gennadiy Civil 2018-04-09 15:33:56 -04:00
  • 44da2b9ac5 cont Gennadiy Civil 2018-04-09 15:23:00 -04:00
  • e93a0ece26 msvc Gennadiy Civil 2018-04-09 13:51:01 -04:00
  • c4684b49cf more msvc Gennadiy Civil 2018-04-09 12:03:40 -04:00