summaryrefslogtreecommitdiffstats
path: root/googletest/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-252-11/+42
|
* Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-278-8/+8
|
* Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-211-28/+0
|
* Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-211-0/+28
|\ | | | | Allow macros inside of parametrized test names.
| * Add a non-parametrized test.Bernhard Bauer2017-09-041-0/+12
| |
| * Allow macros inside of parametrized test names.Bernhard Bauer2017-09-041-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/headAlexey Sokolov2017-09-133-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)
* | use GTEST_ATTRIBUTE_UNUSED_ instead of dummy functionrefs/pull/1243/headHerbert Thielen2017-09-071-7/+1
| |
* | avoid warning about unused variableHerbert Thielen2017-09-041-1/+7
| |
* | avoid -Wshadow warning on GCCHerbert Thielen2017-09-041-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.
* Merge pull request #783 from tobbi/cppcheck_perf_fixesGennadiy Civil2017-09-012-5/+5
|\ | | | | Performance fixes reported by cppcheck
| * Performance fixes reported by cppcheckrefs/pull/783/headTobias Markus2016-05-222-6/+5
| |
* | fix typo in comment and string (SetUpTestCase)Herbert Thielen2017-08-291-2/+2
| |
* | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-227-6/+126
|\ \
| * \ Merge branch 'master' into masterDaniel Krügler2017-08-216-6/+124
| |\ \
| | * \ Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-111-0/+118
| | |\ \ | | | | | | | | | | Adding Bazel build to googletest (initial version )
| | | * | Addressing Commentsrefs/pull/1191/headmisterg2017-08-101-46/+22
| | | | |
| | | * | Added Copyrightmisterg2017-08-101-4/+32
| | | | |
| | | * | Initial Revision, review 164634031misterg2017-08-101-2/+0
| | | | |
| | | * | WIPmisterg2017-08-091-29/+3
| | | | |
| | | * | WIP, win testingmisterg2017-08-081-4/+7
| | | | |
| | | * | WIP, windows testingmisterg2017-08-081-2/+2
| | | | |
| | | * | WIP, windows testingmisterg2017-08-081-2/+2
| | | | |
| | | * | WIP, windows testingmisterg2017-08-081-3/+9
| | | | |
| | | * | WIPmisterg2017-08-081-0/+133
| | | | |
| | * | | Merge pull request #1030 from vpfautz/masterGennadiy Civil2017-08-035-5/+5
| | |\ \ \ | | | | | | | | | | | | Fixed some typos
| | | * | | Fixed some typosrefs/pull/1030/headvpfautz2017-02-265-5/+5
| | | | | |
| | * | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-021-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | | remove duplicated words
| | | * | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-271-1/+1
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
* | | | | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-221-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-101-0/+28
|/ / /
* | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-153-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/masterBilly Donahue2017-05-022-1/+3
|\ \ \ | | | | | | | | Minimal changes to fix build failures on Microsoft Visual Studio 2015
| * | | Minimal changes to fix build failures on Microsoft Visual Studio 2015refs/pull/1034/headDan Kegel2017-03-022-1/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the following errors: hash_map(17): error C2338: <hash_map> is deprecated and will be REMOVED. Please use <unordered_map>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] hash_set(17): error C2338: <hash_set> is deprecated and will be REMOVED. Please use <unordered_set>. You can define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS to acknowledge that you have received this warning. [googlemock\gtest\gtest-printers_test.vcxproj] googletest\test\gtest_catch_exceptions_test_.cc(152): error C2220: warning treated as error - no 'object' file generated googletest\test\gtest_catch_exceptions_test_.cc(152): warning C4297: 'CxxExceptionInDestructorTest::~CxxExceptionInDestructorTest': function assumed not to throw an exception but does googletest\test\gtest_catch_exceptions_test_.cc(152): note: destructor or deallocator has a (possibly implicit) non-throwing exception specification There were already some checks for _MSC_VER in the code, so this commit continues in that vein.
* | | Changes to make TempDir() publicrefs/pull/1077/headGennadiy Civil2017-05-021-1/+1
|/ / | | | | | | Fixes #1076.
* | Merge pull request #728 from DanAlbert/tuple-stlportBilly Donahue2016-11-021-0/+2
|\ \ | | | | | | Fix a test to compile when tuple isn't available.
| * | Fix a test to compile when tuple isn't available.refs/pull/728/headDan Albert2016-03-021-0/+2
| | |
* | | Fix build with MinGW-w64refs/pull/856/headArkadiy Shapkin2016-09-041-1/+1
| | |
* | | Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-242-1/+8
|\ \ \ | | | | | | | | Fix compilation of googletest with MinGW using Win32 threads
| * | | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-222-1/+8
| |/ /
* | | Support running MSVC build on AppVeyourrefs/pull/723/headArkadiy Shapkin2016-06-271-2/+2
| |/ |/|
* | Merge pull request #724 from duggelz/masterBilly Donahue2016-03-151-0/+14
|\ \ | |/ |/| Read Bazel's $XML_OUTPUT_FILE environment variable
| * Restructure test so each scenario is independent.refs/pull/724/headDoug Greiman2016-03-021-20/+13
| |
| * Fix env_var_test to ignore XML_OUTPUT_FILE if already setDoug Greiman2016-03-021-0/+2
| |
| * Restructure $XML_OUTPUT_FILE logicDoug Greiman2016-02-261-5/+11
| |
| * Read Bazel's $XML_OUTPUT_FILE environment variableDoug Greiman2016-02-241-0/+13
| | | | | | | | | | | | If $XML_OUTPUT_FILE is set, and $GTEST_OUTPUT and --gtest_output are not specified, produce output as if GTEST_OUTPUT=xml:$XML_OUTPUT_FILE had been set.
* | Change error message of EXPECT_EQ to treat lhs and rhs equivalently.refs/pull/713/headAlexey Sokolov2016-02-163-113/+114
|/
* Merge pull request #688 from tamland/python3Billy Donahue2016-02-018-14/+18
|\ | | | | Python 3 support
| * add python 3 support to testsThomas Amland2016-01-198-14/+18
| |
* | Add tmux and tmux-256color to the colored terminal list.refs/pull/699/headJoongi Kim2016-01-311-0/+6
|/