Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more mergingrefs/pull/1415/head | Gennadiy Civil | 2018-01-22 | 2 | -6/+4 |
| | |||||
* | merging | Gennadiy Civil | 2018-01-22 | 1 | -2/+2 |
| | |||||
* | code merge | Gennadiy Civil | 2018-01-22 | 8 | -43/+44 |
| | |||||
* | Adding python tests to Bazel build file. refs/pull/1412/head | Gennadiy Civil | 2018-01-18 | 1 | -1/+243 |
| | |||||
* | Expose ScopedTrace utility in public interface | Fedor Trushkin | 2018-01-17 | 3 | -5/+22 |
| | |||||
* | code merges, cleanup | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 |
| | |||||
* | revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/head | Gennadiy Civil | 2018-01-10 | 1 | -46/+3 |
| | |||||
* | code merge, cleanups | Gennadiy Civil | 2018-01-10 | 4 | -19/+58 |
| | |||||
* | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/head | Loo Rong Jie | 2018-01-09 | 1 | -3/+6 |
| | | | | and x64_windows_msvc | ||||
* | Revert one file for now | Gennadiy Civil | 2018-01-05 | 1 | -10/+0 |
| | |||||
* | code cleanup in preparation for merges, cl 180857299 | Gennadiy Civil | 2018-01-05 | 12 | -16/+19 |
| | |||||
* | upstreaming cl 124976692 | Gennadiy Civil | 2018-01-03 | 12 | -78/+0 |
| | |||||
* | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 2 | -11/+42 |
|\ | |||||
| * | Fix tests with VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 2 | -11/+42 |
| | | |||||
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 8 | -8/+8 |
|\ \ | |/ | |||||
| * | Use gender-neutral pronouns in comments and docsrefs/pull/1275/head | Jonathan Wakely | 2017-09-27 | 8 | -8/+8 |
| | | |||||
* | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 3 | -114/+147 |
|\ \ | |/ | |||||
| * | Revert "Allow macros inside of parametrized test names."refs/pull/1271/head | Gennadiy Civil | 2017-09-21 | 1 | -28/+0 |
| | | |||||
| * | Merge pull request #1245 from sheepmaster/2017_09_04_parametrized | Gennadiy Civil | 2017-09-21 | 1 | -0/+28 |
| |\ | | | | | | | Allow macros inside of parametrized test names. | ||||
| | * | Add a non-parametrized test. | Bernhard Bauer | 2017-09-04 | 1 | -0/+12 |
| | | | |||||
| | * | Allow macros inside of parametrized test names. | Bernhard Bauer | 2017-09-04 | 1 | -0/+16 |
| | | | | | | | | | | | | This allows doing things like TEST_P(TestFixture, MAYBE(TestName)) for nicer conditional test disabling. | ||||
| * | | Make the failure messages from EXPECT_EQ and friends actually symmetric,refs/pull/1242/head | Alexey Sokolov | 2017-09-13 | 3 | -114/+147 |
| | | | | | | | | | | | | | | | | | | | | | instead of reading more like reversing the former "expected" and "actual" roles of the LHS and RHS arguments. This patch is manually applied from internal version (125109873) | ||||
* | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-08 | 2 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionrefs/pull/1243/head | Herbert Thielen | 2017-09-07 | 1 | -7/+1 |
| | | | |||||
| * | | avoid warning about unused variable | Herbert Thielen | 2017-09-04 | 1 | -1/+7 |
| | | | |||||
| * | | avoid -Wshadow warning on GCC | Herbert Thielen | 2017-09-04 | 1 | -2/+2 |
| |/ | | | | | | | | | | | When using INSTANTIATE_TEST_CASE_P with a lambda function which uses 'info' as parameter name, GCC complains that this would shadow parameter 'info' used in the macro's VA_ARGS call. | ||||
* | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 6 | -38/+0 |
|/ | | | | | | | | As mentioned in issue #360: "Now that all the platforms gtest supports work with value-parameterized tests, we should remove the uses of the GTEST_HAS_PARAM_TESTS macro from the codebase everywhere." https://github.com/google/googletest/issues/360 | ||||
* | Merge pull request #783 from tobbi/cppcheck_perf_fixes | Gennadiy Civil | 2017-09-01 | 2 | -5/+5 |
|\ | | | | | Performance fixes reported by cppcheck | ||||
| * | Performance fixes reported by cppcheckrefs/pull/783/head | Tobias Markus | 2016-05-22 | 2 | -6/+5 |
| | | |||||
* | | fix typo in comment and string (SetUpTestCase) | Herbert Thielen | 2017-08-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 7 | -6/+126 |
|\ \ | |||||
| * \ | Merge branch 'master' into master | Daniel Krügler | 2017-08-21 | 6 | -6/+124 |
| |\ \ | |||||
| | * \ | Merge pull request #1191 from gennadiycivil/master | Gennadiy Civil | 2017-08-11 | 1 | -0/+118 |
| | |\ \ | | | | | | | | | | | Adding Bazel build to googletest (initial version ) | ||||
| | | * | | Addressing Commentsrefs/pull/1191/head | misterg | 2017-08-10 | 1 | -46/+22 |
| | | | | | |||||
| | | * | | Added Copyright | misterg | 2017-08-10 | 1 | -4/+32 |
| | | | | | |||||
| | | * | | Initial Revision, review 164634031 | misterg | 2017-08-10 | 1 | -2/+0 |
| | | | | | |||||
| | | * | | WIP | misterg | 2017-08-09 | 1 | -29/+3 |
| | | | | | |||||
| | | * | | WIP, win testing | misterg | 2017-08-08 | 1 | -4/+7 |
| | | | | | |||||
| | | * | | WIP, windows testing | misterg | 2017-08-08 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | WIP, windows testing | misterg | 2017-08-08 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | WIP, windows testing | misterg | 2017-08-08 | 1 | -3/+9 |
| | | | | | |||||
| | | * | | WIP | misterg | 2017-08-08 | 1 | -0/+133 |
| | | | | | |||||
| | * | | | Merge pull request #1030 from vpfautz/master | Gennadiy Civil | 2017-08-03 | 5 | -5/+5 |
| | |\ \ \ | | | | | | | | | | | | | Fixed some typos | ||||
| | | * | | | Fixed some typosrefs/pull/1030/head | vpfautz | 2017-02-26 | 5 | -5/+5 |
| | | | | | | |||||
| | * | | | | Merge pull request #764 from flyd1005/wip-fix-typo | Gennadiy Civil | 2017-08-02 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | remove duplicated words | ||||
| | | * | | | remove duplicated wordsrefs/pull/764/head | Li Peng | 2016-04-27 | 1 | -1/+1 |
| | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com> | ||||
* | | | | | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
* | | | | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-10 | 1 | -0/+28 |
|/ / / | |||||
* | | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/head | Nico Weber | 2017-05-15 | 3 | -32/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks. | ||||
* | | | Merge pull request #1034 from dankegel/master | Billy Donahue | 2017-05-02 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | Minimal changes to fix build failures on Microsoft Visual Studio 2015 |