Commit Graph

289 Commits

Author SHA1 Message Date
Daniel Krügler
8304d06199 Merge branch 'master' into master 2017-08-21 20:14:09 +02:00
Gennadiy Civil
e578186528 Merge pull request #1191 from gennadiycivil/master
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
misterg
97a8498873 Addressing Comments 2017-08-10 16:33:22 -04:00
drgler
07bba78a5f Merge branch 'master' of github.com:Dani-Hub/googletest 2017-08-10 21:18:22 +02:00
misterg
cb5b05436d Added Copyright 2017-08-10 12:03:27 -04:00
misterg
b98e30b427 Initial Revision, review 164634031 2017-08-10 11:54:46 -04:00
misterg
ac885f3ab2 WIP 2017-08-09 11:47:54 -04:00
misterg
ab8f2b0d09 WIP, win testing 2017-08-08 15:54:36 -04:00
misterg
40a909b4e5 WIP, windows testing 2017-08-08 15:37:38 -04:00
misterg
a2006b2ab0 WIP, windows testing 2017-08-08 15:34:40 -04:00
misterg
c75de0aa92 WIP, windows testing 2017-08-08 15:32:30 -04:00
misterg
8815087cfa WIP 2017-08-08 15:17:56 -04:00
Gennadiy Civil
ca102b1f9d Merge pull request #1030 from vpfautz/master
Fixed some typos
2017-08-03 16:49:13 -04:00
Gennadiy Civil
0cb2eeb5f1 Merge pull request #764 from flyd1005/wip-fix-typo
remove duplicated words
2017-08-02 17:04:33 -04:00
Nico Weber
09fd5b3ebf Use std::string and ::string explicitly in gtest and gmock code.
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.
2017-05-15 17:53:04 -04:00
Billy Donahue
0ad83afdaa Merge pull request #1034 from dankegel/master
Minimal changes to fix build failures on Microsoft Visual Studio 2015
2017-05-02 14:53:21 -04:00
Gennadiy Civil
611e8a99de Changes to make TempDir() public
Fixes #1076.
2017-05-02 14:16:11 -04:00
Dan Kegel
518e0519ca Minimal changes to fix build failures on Microsoft Visual Studio 2015
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.
2017-03-01 18:40:48 -08:00
vpfautz
a2451c7403 Fixed some typos 2017-02-26 19:15:33 +01:00
Billy Donahue
3447fc31b4 Merge pull request #728 from DanAlbert/tuple-stlport
Fix a test to compile when tuple isn't available.
2016-11-02 13:54:19 -04:00
Arkadiy Shapkin
d8fe70f477 Fix build with MinGW-w64 2016-09-05 00:57:49 +03:00
Billy Donahue
ed9d1e1ff9 Merge pull request #721 from ilmagico/fix-mingw-threads
Fix compilation of googletest with MinGW using Win32 threads
2016-08-24 08:15:38 -04:00
Arkadiy Shapkin
43c0ae3375 Support running MSVC build on AppVeyour 2016-06-27 11:40:27 +03:00
Tobias Markus
08d76be4cc Performance fixes reported by cppcheck 2016-05-22 18:35:52 +02:00
Li Peng
266a185a52 remove duplicated words
Signed-off-by: Li Peng <lip@dtdream.com>
2016-04-27 16:41:27 +08:00
Billy Donahue
72416fab75 Merge pull request #724 from duggelz/master
Read Bazel's $XML_OUTPUT_FILE environment variable
2016-03-15 18:20:27 -04:00
Dan Albert
3429113886 Fix a test to compile when tuple isn't available. 2016-03-02 15:51:28 -08:00
Doug Greiman
d23cf2b157 Restructure test so each scenario is independent. 2016-03-02 12:07:42 -08:00
Doug Greiman
6991f422b6 Fix env_var_test to ignore XML_OUTPUT_FILE if already set 2016-03-01 17:44:02 -08:00
Doug Greiman
5db9cbbc23 Restructure $XML_OUTPUT_FILE logic 2016-02-26 14:26:23 -08:00
Doug Greiman
d6790f26ca Read Bazel's $XML_OUTPUT_FILE environment variable
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.
2016-02-23 18:50:08 -08:00
Daniele Tamino
9759dcda3c Fix compilation on MinGW with native threads 2016-02-22 14:07:12 -08:00
Alexey Sokolov
f364e18837 Change error message of EXPECT_EQ to treat lhs and rhs equivalently. 2016-02-16 23:32:01 +00:00
Billy Donahue
ff5ffd457e Merge pull request #688 from tamland/python3
Python 3 support
2016-02-01 09:41:10 -05:00
Joongi Kim
340c6b3375 Add tmux and tmux-256color to the colored terminal list. 2016-01-31 17:24:31 +09:00
Thomas Amland
d404af0d98 add python 3 support to tests 2016-01-19 14:41:20 +01:00
Mark Mentovai
322a4914a3 Better use of character constants 2015-11-11 17:40:52 -05:00
Mark Mentovai
8b085f0d21 Fix warnings encountered in MSVC build of gtest/gmock tests
This fixes these warnings:

…\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated
…\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value
…\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value

…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated
        …\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)'
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled
…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
2015-11-11 12:28:15 -05:00
Billy Donahue
1f87a0970d Move everything in googletest into googletest/googletest 2015-08-25 16:18:00 -04:00