Commit Graph

2200 Commits

Author SHA1 Message Date
Gennadiy Civil
72a8105966 Testing, adding to sample4 unittest 2018-08-20 14:10:58 -04:00
Gennadiy Civil
9404c5ae04
Merge pull request #1754 from vkotovv/docs-advanced-broken-links
docs: fixed broken references to sections in Advanced guide
2018-08-20 11:04:11 -04:00
Gennadiy Civil
49e6a9b771
Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116
Allow death test child to bypass Windows Error Reporting under MinGW
2018-08-20 10:50:41 -04:00
Gennadiy Civil
c1230dea6b
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Vadim Kotov
ddc618ab31
docs: fix more broken links to sections in Advanced guide 2018-08-20 16:20:14 +03:00
Vadim Kotov
02c4f1af9d
docs: fixed broken references to sections in Advanced guide 2018-08-20 15:31:55 +03:00
Gennadiy Civil
1778f2091e
Merge pull request #1347 from Burgch/fix-argc
Fix value pointed to by `_NSGetArgc()` on macOS.
2018-08-19 14:16:03 -04:00
Gennadiy Civil
97274b1e94
Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil
a946f7db03
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil
d1c1aac781
Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning
Remove default /EHsc compiler flag
2018-08-17 23:27:19 -04:00
Gennadiy Civil
85b572394b
Merge pull request #1652 from medithe/patch-1
Cast the tr1::tuple_element template parameter to int
2018-08-17 23:05:00 -04:00
Tanzinul Islam
cb69e686df Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 2018-08-18 00:00:41 +01:00
Tanzinul Islam
9d77e63e12 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-17 23:58:45 +01:00
Gennadiy Civil
2a380bc26d
Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Gennadiy Civil
e82d320567
Merge pull request #1748 from laixer/std
std references shouldn't be fully qualified
2018-08-17 15:44:11 -04:00
Vadim Berezniker
0796415314 std references shouldn't be fully qualified 2018-08-17 10:49:10 -07:00
Gennadiy Civil
cda442da0b
Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil
edc1bc606e
Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil
88cd66513c
Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Conor Burgess
687964c84f
Merge branch 'master' into fix-argc 2018-08-17 17:15:32 +01:00
Gennadiy Civil
a9bd428e72
Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Gennadiy Civil
02a8ca8773
Merge pull request #1546 from henryiii/cleanup-cmake
Clean up cache non-advanced variable for subproject
2018-08-17 10:27:13 -04:00
Henry Schreiner
a65a993a3c
Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
f87798a3f7
Merge pull request #1646 from tisi1988/master
FIX: Compilation warning with GCC regarding a non-initialised member …
2018-08-16 15:28:20 -04:00
Gennadiy Civil
d20fa182a6
was not quite right,
Fomatting
2018-08-16 15:11:40 -04:00
Gennadiy Civil
b1bfdf0bf4
Small formatting change
And then we can merge
2018-08-16 15:10:07 -04:00
Gennadiy Civil
8c86040dd6
Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil
8b34930c62
Merge pull request #1142 from scottslacksmith/master
Fix/silence false positive memory leaks reported by Microsoft's debug CRT
2018-08-16 13:34:03 -04:00
Gennadiy Civil
c38f4b9f2c
Small style changes.
Just small style changes and we can accept this PR
2018-08-16 13:18:13 -04:00
Gennadiy Civil
f3a9fa6a62
Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil
1dad4cf521
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-16 10:35:56 -04:00
Gennadiy Civil
490554aa0f
Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DF
googletest export
2018-08-15 19:24:13 -04:00
Abseil Team
ca87cc72e2 googletest export
- 208874130 Copybara tweaks, testing various round-trip sutuations(fu... by misterg <misterg@google.com>
  - 208880646 Fix header guards and remove special case copybara by misterg <misterg@google.com>
  - 208874252 Copybara tweaks for googletest reversible transform by misterg <misterg@google.com>
  - 208853103 Adding a flow to export PR from GitHub into Google3 and a... by misterg <misterg@google.com>
  - 208708150 Removing leakr-sensitive words.  by misterg <misterg@google.com>
  - 208672083 Import of OSS PR 1665 by misterg <misterg@google.com>
  - 208663904 Remove LEAKR "author" warnings for googletest copybara ex... by misterg <misterg@google.com>
  - 208646244 Incrementally finalizing OSS<->google3 transforms by misterg <misterg@google.com>
  - 208548323 Move custom google3 only code to custom/ by misterg <misterg@google.com>
  - 208234974 Removed scrubs, replaced with reversible transforms by misterg <misterg@google.com>
  - 208211213 Move custom tests under custom by misterg <misterg@google.com>
  - 208082996 Replace of OSS insert with reversible replace by misterg <misterg@google.com>
  - 208072299 Replace scrubs with reversible replaces, incrementally ge... by misterg <misterg@google.com>
  - 208059357 Replace scrub with reversible replace by misterg <misterg@google.com>
  - 208055415 Fixing GCC brace warning that shows up in OSS with GCC8 a... by misterg <misterg@google.com>
  - 207933728 Incrementally getting close to the reversible transformat... by misterg <misterg@google.com>
  - 207917581 Removing stripping with replace dictionary entries to eas... by misterg <misterg@google.com>
  - 207911026 Incremental Tweaks, on the way to reversible google3<-> g... by misterg <misterg@google.com>
  - 207905179 Removing unnecessary comments stripping by misterg <misterg@google.com>
  - 207901741 Fix typo in Fuchsia death-test implementation. by Abseil Team <absl-team@google.com>
  - 207776408 Move custom tests into /custom by misterg <misterg@google.com>
  - 207746583 Remove stripping for printer for absl:variant by misterg <misterg@google.com>
  - 207733597 Suppress default exception handling for death-test proces... by Abseil Team <absl-team@google.com>
  - 207719598 Import of googletest from Github. by misterg <misterg@google.com>
  - 207283991 PR1673, extra parentheses in declaration cause GCC 8.1.1 ... by misterg <misterg@google.com>
  - 206986279 Fix Duplicate definition, (original in googletest-test_te... by misterg <misterg@google.com>
  - 206980794 Allow googletest-json-output unitest to handle supporting... by misterg <misterg@google.com>
  - 206957064 Refactor to avoid OSS round-trip transformation problems ... by misterg <misterg@google.com>
  - 206760733 Fixed weird syntax in these tests that was causing OSS tr... by misterg <misterg@google.com>
  - 206750694 Tweak copybara,  by misterg <misterg@google.com>
  - 206611945 Make files consistent to enable copybara round-trip trans... by misterg <misterg@google.com>
  - 206589404 OSS changes to open source two more tests by misterg <misterg@google.com>
  - 206355044 Fixing copybara (was missing comment) by misterg <misterg@google.com>
  - 206323492 Make reversible transforms possible for Copybara OSS<->go... by misterg <misterg@google.com>
  - 206011852 Consolidate various copybara files into one file. by misterg <misterg@google.com>
  - 205999518 remove weird char, should be space. pump and generated .h... by misterg <misterg@google.com>
  - 205897244 Small cleanups to avoid potentially hard-to-reverse OSS t... by misterg <misterg@google.com>
  - 205894405 Simplifying include path for tests. by misterg <misterg@google.com>
  - 205892873 Removing obsolete files by misterg <misterg@google.com>
  - 205873647 Simplifying include path for samples. by misterg <misterg@google.com>
  - 205712910 Continue restructuring, will have common copybara file to... by misterg <misterg@google.com>
  - 205711819 Removing non-ASCII chars by misterg <misterg@google.com>
  - 205702635 Refactor internal googletest name to match OSS Name by misterg <misterg@google.com>
  - 205403311 Comments change by misterg <misterg@google.com>
  - 205246538 OSS community (https://github.com/google/googletest/pull/... by misterg <misterg@google.com>
  - 205242422 Moving RE2 into custom where it rightfully belongs by misterg <misterg@google.com>
  - 205138666 Add a 3-ary Property() matcher overload for ref-qualified... by Abseil Team <absl-team@google.com>
  - 205128154 Automated g4 rollback of changelist 205108639. by misterg <misterg@google.com>
  - 205108639 Moving RE2 into custom where it rightfully belongs by misterg <misterg@google.com>
  - 205102342 Comment link fix by misterg <misterg@google.com>
  - 205097052 OSS sync, still need to worry about not C++11 by misterg <misterg@google.com>
  - 205080271 Keeping up with the changes, ensure that the code still t... by misterg <misterg@google.com>
  - 204815384 Mark the various RE legacy versions of the matchers as de... by Abseil Team <absl-team@google.com>
  - 204744294 OSS, someone noticed that if GTEST_HAS_EXCEPTIONS is set ... by misterg <misterg@google.com>
  - 204363541 Add stacktrace support to the non-Google3 version of Goog... by Abseil Team <absl-team@google.com>
  - 204330832 Google Test: absl::variant is now open source, so add the by Abseil Team <absl-team@google.com>
  - 204130690 Bringing in OSS PR 1647 by misterg <misterg@google.com>
  - 203979061 Set 'reason' field for leakr.disable_check() transformati... by Abseil Team <absl-team@google.com>
  - 203954557 Fixing comments, otherwise copybara leaves extra "//" in ... by misterg <misterg@google.com>
  - 203487065 Correctly handle legacy regular expressions in googletest... by Abseil Team <absl-team@google.com>
  - 201997367 Remove references to GTEST_HAS_PROTOBUF_. by Abseil Team <absl-team@google.com>
  - 201735597 Upgrade gUnit from RE to RE2 -- Step 3/4 by Abseil Team <absl-team@google.com>
  - 201229160 Upgrade gUnit from RE to RE2 -- Step 1/4 by Abseil Team <absl-team@google.com>
  - 201228020 Remove extra copy of gunit samples - there should really ... by misterg <misterg@google.com>
  - 200602156 Eliminate GTEST_TEST_FILTER_ENV_VAR_. by Abseil Team <absl-team@google.com>
  - 200500026 Make RegisterTasks faster by Abseil Team <absl-team@google.com>
  - 200361990 Add IWYU pragmas to gmock headers. by Abseil Team <absl-team@google.com>
  - 200292286 Fix speling by Abseil Team <absl-team@google.com>
  - 200222319 Adding docs to copybara. by misterg <misterg@google.com>
  - 199815917 Fuchsia: Change fdio include path. by Abseil Team <absl-team@google.com>
  - 199195290 Remove launchpad dependency from Fuchsia. by Abseil Team <absl-team@google.com>
  - 199134849 Add printer for std::nullptr_t. by Abseil Team <absl-team@google.com>
  - 198710999 Properly decay variadic matchers by Abseil Team <absl-team@google.com>
  - 197733704 WIP - copybara script capable of google3-to-github  by misterg <misterg@google.com>
  - 197166689 Keeping up, sync cl/197012432 to combined "googletest" di... by misterg <misterg@google.com>
  - 196253300 Keep up with changes,cl/196162435 by misterg <misterg@google.com>
  - 195816901 go/googletest-plan by misterg <misterg@google.com>
  - 195816542 Moving http://cl/167016557 and http://cl/195690905 into c... by misterg <misterg@google.com>
  - 195712930 Following up for http://cl/195677772 More fixing typos, p... by misterg <misterg@google.com>
  - 195702162 Moving http://cl/195020996 into combined dir by misterg <misterg@google.com>
  - 195677772 Fix typos, the original IWYU was  by misterg <misterg@google.com>
  - 195249681 go/googletest-plan , Combine gUnit and gMock into third_p... by misterg <misterg@google.com>

PiperOrigin-RevId: 208874130
2018-08-15 17:15:36 -04:00
Gennadiy Civil
1246e5807a
Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil
2172c08c92
Merge pull request #1697 from morris-stock/ignore-cmake-generated-files
Ignore cmake generated files when used as submodule
2018-08-15 11:39:13 -07:00
Gennadiy Civil
3c4f437c24
Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil
06b9759288
Merge branch 'master' into ignore-cmake-generated-files 2018-08-15 10:17:09 -07:00
Gennadiy Civil
7e7e3a6f45
Merge branch 'master' into patch-1 2018-08-15 08:37:15 -07:00
Gennadiy Civil
997d343dd6
Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix
Change location of pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR
2018-08-15 08:26:25 -07:00
Gennadiy Civil
02671abb44
Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil
587ceaeaee
Merge pull request #1741 from gennadiycivil/master
Comments changes, no functionality changes.
2018-08-14 14:24:01 -07:00
Gennadiy Civil
f0e4c411ca more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
e26771776b
Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil
bbf738a2c1 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
265efde9a5 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
3306848f69
Merge pull request #1740 from gennadiycivil/master
Comments changes, no functionality changes
2018-08-14 11:18:43 -07:00
Gennadiy Civil
a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
41fec55881
Merge pull request #1665 from rongjiecomputer/deprecate
Disable MSVC function deprecation when using Clang
2018-08-14 10:48:11 -07:00
Gennadiy Civil
2421eff9f7
Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil
17714d65e1
Merge pull request #1738 from gennadiycivil/master
Code formatting changes, clean up, no functionality changes
2018-08-14 08:21:59 -07:00