2142 Commits

Author SHA1 Message Date
Gennadiy Civil
21e518557a
Merge branch 'master' into josh/fix_scoped_class2 2018-08-16 11:13:12 -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
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
06b9759288
Merge branch 'master' into ignore-cmake-generated-files 2018-08-15 10:17:09 -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
Gennadiy Civil
f225735222 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil
15ef6ec064
Merge pull request #1733 from gennadiycivil/master
Move instructions into custom/README files
2018-08-14 07:55:28 -07:00
Gennadiy Civil
caeaef302d
Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
Gennadiy Civil
c203bee245 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil
9060e19c87 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Gennadiy Civil
8bc11c040a
Merge pull request #924 from wind-river-cdt/cross-testing-patch-1
Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for tests
2018-08-13 13:20:07 -07:00
Elias Daler
9ca399ae05 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil
47b57ff1b2
Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil
44fb2a1edd Merge branch 'master' of https://github.com/google/googletest 2018-08-13 14:32:06 -04:00
Gennadiy Civil
63baab8924 Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Gennadiy Civil
7800ba3eea
Merge pull request #1732 from gennadiycivil/master
comment cleanup
2018-08-13 10:18:11 -07:00
Gennadiy Civil
18c940d13a comment cleanup 2018-08-13 13:17:38 -04:00
Gennadiy Civil
65b42fa615
Merge pull request #1731 from 2power10/master
Fix the bad format issues in docs/advanced.md
2018-08-13 07:26:29 -07:00
Yi Zheng
ecc241900a - Fix the broken markdown table
- Fix some format issue
2018-08-13 17:57:51 +08:00
Gennadiy Civil
ae94a9097d
Merge pull request #1727 from gennadiycivil/master
Mode change on a python script
2018-08-10 13:09:36 -07:00
Gennadiy Civil
390a6b7932 Mode change on a python script 2018-08-10 15:42:16 -04:00
Gennadiy Civil
8cccb2a718
Update README.md 2018-08-10 15:20:51 -04:00
Gennadiy Civil
9cb381952e
Merge pull request #1726 from google/gennadiycivil-patch-2
Feature forward plans -  README.md
2018-08-10 12:20:10 -07:00
Gennadiy Civil
b1236528fe
Update README.md 2018-08-10 12:05:17 -04:00
Gennadiy Civil
77ac31c35f
Update README.md 2018-08-10 11:30:04 -04:00
Gennadiy Civil
4de527dc2c
Update README.md 2018-08-10 11:29:18 -04:00
Gennadiy Civil
945618b202
Update README.md 2018-08-10 11:06:52 -04:00
Gennadiy Civil
e821a2db23
Update README.md 2018-08-10 10:59:52 -04:00
Gennadiy Civil
6b6be9457b
Merge pull request #1725 from google/gennadiycivil-patch-1
Update gmock_output_test.py, formatting
2018-08-09 12:54:07 -07:00
Gennadiy Civil
5eb263569b
Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil
b46b86ee60
Merge pull request #1719 from happyCoder92/master
docs: fix broken links
2018-08-09 10:54:09 -07:00
Gennadiy Civil
6b89cb06a7
Merge pull request #1724 from gennadiycivil/master
formatting and small changes related to code management
2018-08-09 10:53:58 -07:00
Gennadiy Civil
4e13415ff4
Merge branch 'master' into master 2018-08-09 10:40:06 -07:00
Gennadiy Civil
640556f9e5 Merge branch 'master' of https://github.com/google/googletest 2018-08-09 13:37:27 -04:00
Gennadiy Civil
acaf5beacc formatting and small changes related to code management, no functionality changes 2018-08-09 13:37:11 -04:00
Gennadiy Civil
4843eafd9e
Merge pull request #1723 from gennadiycivil/master
code management comments,
2018-08-09 09:23:00 -07:00
Gennadiy Civil
71c2bb4a97
Merge branch 'master' into master 2018-08-09 09:22:40 -07:00
Gennadiy Civil
4d9411467d code management comments, [ci-skip], no functionality changes 2018-08-09 12:21:49 -04:00
Gennadiy Civil
33596cb5c3
Merge pull request #1721 from gennadiycivil/master
Fixing identation, causes build errors when warnings are treated as errors
2018-08-09 09:11:18 -07:00
Gennadiy Civil
7a79459a66 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:55:48 -04:00
Gennadiy Civil
54cb8b0238 Merge branch 'master' of github.com:gennadiycivil/googletest 2018-08-09 11:54:12 -04:00
Gennadiy Civil
f7042937af Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:53:45 -04:00
Gennadiy Civil
d5b31df900
Update gtest-death-test.cc 2018-08-09 11:33:42 -04:00
Gennadiy Civil
9faeadedf4 Merge branch 'master' of https://github.com/google/googletest 2018-08-09 11:12:41 -04:00
Gennadiy Civil
ecc6944fb1 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:12:12 -04:00
Gennadiy Civil
2797ba8f91
Merge pull request #1720 from gennadiycivil/master
Formatting change for auto code management, no functionality changes
2018-08-09 07:53:26 -07:00
Gennadiy Civil
3d167fde42 Merge branch 'master' of github.com:gennadiycivil/googletest 2018-08-09 10:52:09 -04:00
Gennadiy Civil
063a90b391 Formatting change for auto code management, no functionality changes
Merge branch 'master' of https://github.com/google/googletest
2018-08-09 10:51:49 -04:00
Loo Rong Jie
24786cb498
Merge branch 'master' into deprecate 2018-08-09 20:08:44 +08:00
Wiktor Garbacz
db43df6df7 docs: fix broken links 2018-08-09 13:14:36 +02:00
Gennadiy Civil
4de57ce787
Merge pull request #1714 from gennadiycivil/master
Formatting tweaks, no functionality changes
2018-08-08 12:47:02 -07:00
Gennadiy Civil
541eeb4b40
Merge branch 'master' into master 2018-08-08 12:19:55 -07:00
Gennadiy Civil
11f5a2740a
Merge branch 'master' into cross-testing-patch-1 2018-08-08 12:19:04 -07:00
Gennadiy Civil
00fc0d24d1 Formatting tweaks, no functionality changes 2018-08-08 15:14:21 -04:00
Gennadiy Civil
66bd580b5b
Merge pull request #1713 from gennadiycivil/master
code management changes, no functionalty changes
2018-08-08 11:41:59 -07:00
Gennadiy Civil
0eeb1afcac code management changes, no functionalty changes 2018-08-08 14:41:21 -04:00
Gennadiy Civil
61799bd500
Merge pull request #1710 from gennadiycivil/master
Formatting Changes and small code merge
2018-08-08 10:34:21 -07:00
Gennadiy Civil
d31266e4ec Merge branch 'master' of github.com:gennadiycivil/googletest 2018-08-08 13:22:10 -04:00
Gennadiy Civil
35e1959125 Formatting Changes and small code merge 2018-08-08 13:21:45 -04:00
Gennadiy Civil
d5d335b1d0 Merge branch 'master' of https://github.com/google/googletest 2018-08-08 13:20:34 -04:00
Gennadiy Civil
bdf5fd3a98 Merge branch 'master' of https://github.com/google/googletest
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:02 -04:00
Gennadiy Civil
d526632675
Merge pull request #1708 from drwez/fixFuchsia
Fix typo breaking Fuchsia build.
2018-08-08 08:58:22 -07:00
Wez
07d45437f2 Fix typo breaking Fuchsia build 2018-08-07 16:53:10 -07:00
Gennadiy Civil
b95a702d5f
Merge pull request #1707 from gennadiycivil/master
upsream additional printer test
2018-08-07 11:18:54 -07:00
Gennadiy Civil
094d7d292f Merge branch 'master' of https://github.com/google/googletest 2018-08-07 14:05:54 -04:00
Gennadiy Civil
41e82cadf4 upsream additional printer test 2018-08-07 14:05:42 -04:00
Gennadiy Civil
8506852a17
Merge pull request #1705 from gennadiycivil/master
Formatting changes,small cleanup,  no functionality changes
2018-08-07 10:04:48 -07:00
Gennadiy Civil
b345bf9090 Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
Gennadiy Civil
dd06b16e76
Merge pull request #1699 from drwez/suppressDefault
Suppress default exception handling
2018-08-07 08:08:39 -07:00
Gennadiy Civil
252dc32f96
Merge branch 'master' into suppressDefault 2018-08-07 07:39:31 -07:00
Gennadiy Civil
6f168c1f82
Merge pull request #1704 from gennadiycivil/master
small cleanup, np functional changes
2018-08-07 07:39:15 -07:00
Gennadiy Civil
b78c3b8e00 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil
886a74769e
Merge branch 'master' into suppressDefault 2018-08-06 18:02:42 -07:00
Gennadiy Civil
28b71e444c
Merge pull request #1700 from gennadiycivil/master
automatic code sync mgt, comment only
2018-08-06 12:41:03 -07:00
Gennadiy Civil
24edf4e3bf automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil
c81a34905d
Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_error
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration
2018-08-06 12:13:47 -07:00
Wez
5d2e503574 No default exception handling 2018-08-03 16:26:16 -07:00
Gennadiy Civil
61f949387e
Merge branch 'master' into deprecate 2018-08-03 12:05:07 -04:00
Philipp Paulweber
1da26a77c5
Printers test: fixed compilation bug, due to unnecessary parentheses in declaration 2018-08-03 12:01:30 +02:00
wxf
51b65058ad Ignore cmake generated files when used as submodule 2018-08-03 16:46:08 +08:00
Gennadiy Civil
e887b03e5a
Merge pull request #1696 from gennadiycivil/master
Code transforms changes, renames.
2018-08-02 23:22:12 -04:00
Gennadiy Civil
2a7077fa24 one more fix 2018-08-02 20:03:26 -07:00
Gennadiy Civil
b929d55704 cmake fixes 2018-08-02 17:46:43 -04:00
Gennadiy Civil
0d29f9702d more fixes 2018-08-02 17:32:43 -04:00
Gennadiy Civil
95c313e685 add --no_stacktrace_support for json-output-unittest 2018-08-02 16:58:11 -04:00
Gennadiy Civil
94f2c6faa7 fixes tests 2018-08-02 16:51:03 -04:00
Gennadiy Civil
677df883ec cmake test fixes 2018-08-02 16:24:09 -04:00
Gennadiy Civil
b7244ff37c cmake fixes 2018-08-02 16:01:00 -04:00