3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-21 15:11:57 +08:00
Code Issues Projects Releases Wiki Activity
3,175 Commits 7 Branches 27 Tags 40 MiB
Commit Graph

3175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Braun-Jones
98d988deac Add CMake install rules for gtest libraries and headers 2015-11-23 16:53:09 -05:00
Billy Donahue
786564fa4a Merge pull request #627 from mark-chromium/tests_msvs 
Fix warnings encountered in MSVC build of gtest/gmock tests
 2015-11-23 10:10:53 -05:00
Mark Mentovai
4a8e54401e Name the helper AsBits() 2015-11-12 10:01:06 -05:00
Mark Mentovai
cfe466a0a7 Use a templated helper to wrap the cast 
The helper needs to be templated because its argument type can’t be
known. FloatingPointTest is instantiated with RawType = float and
RawType = double, so Bits will be an unsigned 32-bit or 64-bit type.
size_t will be either 32 or 64 bits depending on the system’s
definition, typically based on pointer size.
 2015-11-11 18:26:35 -05:00
Mark Mentovai
cbce23fb86 Leave decltype(max_ulps_) alone and cast, not sure this is better 2015-11-11 17:44:12 -05:00
Mark Mentovai
322a4914a3 Better use of character constants 2015-11-11 17:40:52 -05:00
Fábio Junqueira
4a0b77ff72 Create CMakeLists.txt 
Adding functionality to build googletest from the root directory
 2015-11-11 18:29:41 -02: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
71a26ac68b Merge pull request #612 from mark-chromium/gmock_rtti 
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
 2015-11-10 17:48:26 -05:00
Billy Donahue
5bd7c2b589 Merge pull request #611 from mark-chromium/gmock_cxx11 
googlemock: Support C++11 language with pre-C++11 library
 2015-11-10 17:47:45 -05:00
Billy Donahue
cf517375ef Merge pull request #605 from d-meiser/fix-visibility-hidden 
Fix building of gtest with -fvisibility=hidden [#451]
 2015-10-29 23:45:29 -04:00
Dominic Meiser
84d7ff1088 Fix symbol visibility of StreamingListener. 2015-10-29 21:56:02 -06:00
Dominic Meiser
580378d522 Add an option to enable building with -fvisibility=hidden. 
When this option is set gtest itself is built with -fvisibility=hidden
with gcc and clang.  This replicates MSVC's default behaviour with gcc
and clang.
 2015-10-29 21:56:02 -06:00
Dominic Meiser
bb5c92f9d1 Fix definition of GTEST_API_ macro for gcc and clang [#451]. 
This is to enable using gtest with -fvisibility=hidden.
 2015-10-29 21:55:46 -06:00
Billy Donahue
43359642a1 Merge pull request #616 from anuragsoni/documentation/fix-readme-for-googletest 
update googletest readme to fix broken links
 2015-10-19 12:18:28 -04:00
Anurag Soni
788dee904d update googletest readme to fix broken links 2015-10-19 11:46:46 -04:00
Anton Klautsan
6705b9adea Override clang++ name on Linux only 2015-10-18 13:02:49 +01:00
Anton Klautsan
bbbc025d2e More docs in travis config 2015-10-18 02:34:12 +01:00
Anton Klautsan
b8f9b2b540 Update clang version 2015-10-18 02:28:57 +01:00
Anton Klautsan
e8193fe6e0 Adding llvm toolchain repo 2015-10-18 02:25:24 +01:00
Anton Klautsan
c76f9e0cdd Update .travis.yml 2015-10-18 02:13:24 +01:00
Anton Klautsan
231af5ddc8 Try to use clang-3.6 in travis 2015-10-18 02:01:42 +01:00
Anton Klautsan
58b543535a Update .travis.yml 2015-10-18 01:51:49 +01:00
Anton Klautsan
c81cf6b7ef Update .travis.yml 2015-10-18 01:49:11 +01:00
Mark Mentovai
c8a1050704 googlemock: Disable WhenDynamicCastToTest tests when RTTI is off 
https://github.com/google/googletest/issues/610
 2015-10-12 18:01:43 -04:00
Mark Mentovai
a0435dc687 googlemock: Support C++11 language with pre-C++11 library 
This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_.
 2015-10-12 17:59:11 -04:00
Billy Donahue
554ca00ff7 Update DevGuide.md 
stop talking about subversion in the devguide.
 2015-10-08 09:32:40 -04:00
Billy Donahue
7f4448f40b Merge pull request #604 from marco-m/urls-should-go-to-github 
Fix URLs in documentation (point to github, relative links)
 2015-10-04 12:41:40 -04:00
Marco Molteni
6adbc8698a Fix relative links in documentation 2015-10-04 18:25:25 +02:00
Marco Molteni
c65f6ce4a2 Update URLs from googlecode to github 2015-10-04 18:07:30 +02:00
Matthew Brandyberry
bf7e9e8c2b Add include of sys/types.h. 2015-10-02 16:38:02 -05:00
Matthew Brandyberry
a7964a3fbd Implement GetThreadCount for AIX. 2015-10-02 11:15:53 -05:00
Billy Donahue
0dd5ef8bd4 Merge pull request #597 from marco-m/patch-1 
Fix broken link to FrequentlyAskedQuestions
 2015-09-23 17:58:44 -04:00
Marco Molteni
e35cee9698 Fix broken link to FrequentlyAskedQuestions 2015-09-23 21:08:21 +02:00
Billy Donahue
9751f4dfa4 Merge pull request #594 from martinmaly/gmock 
Adding missing files to googlemock distribution.
 2015-09-20 03:44:08 -04:00
Billy Donahue
c8c8f8c587 Merge pull request #593 from martinmaly/distcheck 
Adding missing header files to the distribution.
 2015-09-20 03:23:53 -04:00
Martin Maly
210392eb27 Adding missing files to googlemock distribution. 2015-09-19 23:10:58 -07:00
Martin Maly
48368f0c7d Adding missing header files to the distribution. 2015-09-19 21:58:33 -07:00
Ferenc-
30846f31c5 Fix typo in googlemock/README.md 2015-09-19 00:10:55 +02:00
Billy Donahue
b16fc6a69d Merge pull request #591 from google/BillyDonahue-patch-1 
Fix relative links in googlemock docs.
 2015-09-17 18:24:36 -04:00
Billy Donahue
8cb0499b6a Fix relative links in googlemock docs. 2015-09-17 18:22:40 -04:00
Billy Donahue
31eb85ee6a Merge pull request #589 from nomis52/master 
Fix the googlemock autotools build.
 2015-09-17 12:26:15 -04:00
Simon Newton
39062f4e30 Fix the googlemock autotools build. 2015-09-17 08:33:43 -07:00
Billy Donahue
de411c3e80 Merge pull request #585 from orgads/warning-fix 
Fix unused static variable warning on Windows
 2015-09-09 09:19:40 -04:00
Orgad Shaneh
904ad180fe Fix unused static variable warning on Windows 2015-09-09 12:32:57 +03:00
Billy Donahue
b78f858d0c Include <memory> to use std::unique_ptr. 2015-09-08 02:46:25 -04:00
Billy Donahue
f19b060075 Googlemock has some tuples containing lvalue refs in its unit tests. 
These tuples are created with make_tuple, which is given temporaries.
The make_tuple is in a function argument list.

A possibly overzealous static_assert in libc++'s std::tuple ctor
is firing in our 'Perform(make_tuple("hi"))' calls, so
we can't use its make_tuple here. Instead we will use
explicitly-constructed tuples constructed from non-temporary strings.

Workaround for llvm bug:
    https://llvm.org/bugs/show_bug.cgi?id=20855

An alternative to https://github.com/google/googletest/pull/580 .
 2015-09-07 22:32:56 -04:00
Billy Donahue
99166db754 Merge pull request #579 from daus-salar/patch-1 
FIX add missing blank line between text and table
 2015-09-07 21:11:47 -04:00
Billy Donahue
11ae3881eb Merge pull request #582 from dmircevski/build-c++11 
Add c++11 build to the Travis matrix.
 2015-09-07 20:45:58 -04:00
deki
517b3bdc29 Add c++11 build to the Travis matrix. 2015-09-07 18:23:25 -04:00
Daus Salar
6460005ba4 FIX add missing blank line between text and table 
The markdown interpreter don't interpret the table otherwise.
 2015-09-05 01:12:03 +02:00
Billy Donahue
f570b27e15 Merge pull request #578 from BillyDonahue/upstream_master 
build once
 2015-09-01 02:50:47 -04:00
Billy Donahue
4e8f8cc3e2 build once 2015-09-01 02:50:19 -04:00
Billy Donahue
d6b112ccfd Merge pull request #577 from BillyDonahue/upstream_master 
run tests in Travis CI
 2015-09-01 02:46:34 -04:00
Billy Donahue
6fc4905021 run tests 2015-09-01 02:41:55 -04:00
Billy Donahue
9986d43dd9 reduce the ci matrix 2015-09-01 02:29:21 -04:00
Billy Donahue
fbb0b96016 restore test running 2015-09-01 02:24:48 -04:00
Billy Donahue
8be1b6b087 Merge branch 'travis' 
Conflicts:
	travis.sh
 2015-09-01 02:17:16 -04:00
Billy Donahue
fb6f62d107 run tests in Travis CI 2015-09-01 02:14:45 -04:00
Billy Donahue
897fa8e964 break out test and mock in travis 2015-08-31 10:31:08 -04:00
Billy Donahue
fefba42a05 break out test and mock in travis 2015-08-31 10:29:11 -04:00
Billy Donahue
a48c4e5e36 cleanup travis.sh 2015-08-31 10:21:58 -04:00
Billy Donahue
e5c7bbae18 remove unused valgrind probe 2015-08-31 10:08:44 -04:00
Billy Donahue
520d30c035 travis update 2015-08-31 09:54:37 -04:00
Billy Donahue
b1b7bd3c08 Merge branch 'master' of github.com:google/googletest into travis 2015-08-31 09:46:11 -04:00
Billy Donahue
604bd64d11 Update README.md 2015-08-31 09:43:03 -04:00
Billy Donahue
7443fb92ef Merge pull request #575 from BillyDonahue/master 
travis continuous integration
 2015-08-31 03:28:40 -04:00
Billy Donahue
be2c677cff Merge branch 'master' of github.com:BillyDonahue/googletest into travis 2015-08-31 03:21:00 -04:00
Billy Donahue
df688319de travis googlemock as well 2015-08-31 03:19:21 -04:00
Billy Donahue
12a8c19167 travis fix 2015-08-31 02:58:45 -04:00
Billy Donahue
02310e73c6 Merge pull request #1 from BillyDonahue/travis 
travis config
 2015-08-31 02:52:55 -04:00
Billy Donahue
bbb54ef0ee travis config 2015-08-31 02:19:39 -04:00
Billy Donahue
ff49eded84 Merge pull request #574 from BillyDonahue/undoc 
Undoc
 2015-08-30 12:49:46 -04:00
Billy Donahue
dcec1cede2 Merge branch 'master' into undoc 2015-08-30 12:46:50 -04:00
Billy Donahue
2e10aed6d6 Merge branch 'BillyDonahue-undoc' 2015-08-30 12:45:13 -04:00
Billy Donahue
2eb7748e70 merge 2015-08-30 12:40:37 -04:00
Billy Donahue
da25f9ee21 readme merging 2015-08-30 12:38:08 -04:00
Billy Donahue
23bd6d8a9b readme merging 2015-08-30 12:36:37 -04:00
Billy Donahue
b55ac7f36f readme merging 2015-08-30 12:13:33 -04:00
Billy Donahue
24ecc348b9 Merge pull request #571 from srouquette/python3 
Fix gmock_doctor.py for Python3
 2015-08-30 12:09:32 -04:00
Billy Donahue
60c85a40ff Merge pull request #570 from Codie-Labs/master 
xcode: project file corrected
 2015-08-30 12:06:31 -04:00
Syl
ac830d6b19 Fix gmock_doctor.py for Python3 2015-08-30 09:06:14 +02:00
Nagy Gergő
f5bc23fe4d Merge pull request #1 from gregory094/master 
xcode: project file corrected
 2015-08-29 22:52:16 +02:00
Gregory Nagy
8ca3ffdbb7 xcode: project file corrected 
Project file contained the 'README' instead of 'README.md'
that's why the build failed with the fact that it can't
copy this file for its proper location.

Signed-off-by: Gergő Nagy <gergo@getcodie.com>
 2015-08-29 22:48:14 +02:00
Billy Donahue
d945d8c000 fix a link 2015-08-27 10:26:17 -04:00
Billy Donahue
64d23926f9 Merge pull request #568 from lacombar/googlemock-build-dir 
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
 2015-08-27 10:24:19 -04:00
Arnaud Lacombe
eff38a7a0f googlemock: fix unified build 2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999 readme merging 2015-08-26 21:45:10 -04:00
Billy Donahue
4af3c08579 readme merging 2015-08-26 18:29:25 -04:00
Billy Donahue
37b5c297cf readme merging 2015-08-26 18:28:20 -04:00
Billy Donahue
fba825826a Update README.md 2015-08-26 10:02:07 -04:00
Billy Donahue
ecf9459561 Merge remote-tracking branch 'google/master' 2015-08-26 00:52:34 -04:00
Billy Donahue
bf5753ac60 Update README.md 2015-08-25 19:17:02 -04:00
Billy Donahue
09fd2462ac Update README.md 2015-08-25 19:16:41 -04:00
Billy Donahue
0b6d3b195e Merge pull request #512 from google/unification 
Unify googlemock into googletest
 2015-08-25 18:54:04 -04:00
Billy Donahue
661699bfc0 Merge pull request #511 from BillyDonahue/unification 
Bring GoogleMock into the GoogleTest repository
 2015-08-25 18:46:30 -04:00
Billy Donahue
8a3c8c9376 tiny fix 2015-08-25 18:33:08 -04:00
Billy Donahue
5b3ef3bd6c unified project home 2015-08-25 18:23:36 -04:00
Billy Donahue
7563fe553e cat _home.md files into README.md 2015-08-25 17:56:57 -04:00
Billy Donahue
67f6188c8f move ProjectHome files into root 2015-08-25 17:55:28 -04:00