3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-15 00:47:54 +08:00
Code Issues Projects Releases Wiki Activity
1,303 Commits 7 Branches 27 Tags 39 MiB
Commit Graph

1303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Münch
62b167e409 Fix: Markdown in V1_7_Primer.md 
table "Basic Assertions" is now rendered correctly as table
 2016-01-02 15:50:09 +01:00
mehagar
ff7263226a Fix typo in AdvancedGuide.md 2015-12-29 07:29:56 -06:00
Billy Donahue
13206d6f53 Merge pull request #670 from dawikur/master 
Update GTEST_PROJECT_URL_ in internal/gtest-port.h
 2015-12-23 07:57:42 -05:00
Dawid Kurek
ac35fe7359 Update GTEST_PROJECT_URL_ in internal/gtest-port.h 
As repository moved to github. All urls need to be changed. There is
still plenty to do.
 2015-12-23 09:49:14 +01:00
Billy Donahue
ddb8012eb4 Merge pull request #602 from mtbrandy/threadcount_aix 
Implement GetThreadCount for AIX.
 2015-12-10 17:29:15 -05:00
Billy Donahue
0162ff72e8 Merge pull request #657 from audiofanatic/issue655-targetHeaderDeps 
Add include dirs to targets if CMake version supports it
 2015-12-10 17:28:00 -05:00
Billy Donahue
c1cd9c2b05 Merge pull request #650 from jpuigcerver/master 
Added missing CMake install rules for GMock
 2015-12-10 17:25:53 -05:00
Billy Donahue
57b376a9cb Merge pull request #660 from waynix/FixLinks 
fixed link in googlemock documentation
 2015-12-08 10:58:04 -05:00
Paul Rosset
a470862dbe fixed link in googlemock documentation 2015-12-08 16:02:50 +01:00
Craig Scott
f601ee162e Add include dirs to targets if CMake version supports it 2015-12-06 16:31:21 +11:00
Billy Donahue
35fb11efbe Merge pull request #654 from cmorse/doc_fix 
Fix lots of broken links in documentation
 2015-12-04 00:18:09 -05:00
Caleb Morse
ebd1d0887c Fix link to FAQ in Primer.md 2015-12-03 21:23:56 -05:00
Joan Puigcerver
7c8ac4886a Added CMake install rules for GMock 2015-12-03 09:33:21 +01:00
Billy Donahue
1f8fe13618 Merge pull request #647 from mithro/patch-1 
Fix AdvancedGuide link in FAQ.md
 2015-12-02 12:35:35 -05:00
Tim Ansell
16b9bbc3ef Fix AdvancedGuide link in FAQ.md 2015-12-02 13:27:36 +11:00
Billy Donahue
2f93e2d808 Merge pull request #636 from ReadmeCritic/master 
Update README URLs based on HTTP redirects
 2015-11-30 14:06:12 -05:00
Billy Donahue
6fe019e6b7 Merge pull request #607 from google/BillyDonahue-patch-1 
Update DevGuide.md
 2015-11-30 14:05:44 -05:00
Billy Donahue
3c3a4ac2c2 Merge pull request #640 from Ali-Se/patch-2 
Fixing some table error in file
 2015-11-30 14:01:33 -05:00
Billy Donahue
96bba4d5c1 Merge pull request #638 from KindDragon/patch-1 
Update FAQ.md
 2015-11-30 14:00:48 -05:00
Billy Donahue
ccd0f94e82 Merge pull request #592 from Ferenc-/master 
Fix typo in googlemock/README.md
 2015-11-30 13:49:47 -05:00
Ali Sa'ad Eddeen
25409abfe7 Fixing some table error in file 
Some tables have missing commas inside the code that make some table cells merge, added missing commas
 2015-11-29 23:25:06 +04:00
Arkady Shapkin
83b93eac3b Update FAQ.md 2015-11-28 17:59:51 +03:00
ReadmeCritic
3aef7d7ddd Update README URLs based on HTTP redirects 2015-11-25 08:25:03 -08:00
Billy Donahue
ffce1a8578 Merge pull request #633 from plopresti/master 
Fix missing-field-initializers GCC/Clang warning (issue 433).
 2015-11-24 13:51:39 -05:00
Patrick J. LoPresti
f44190f2c4 Fix missing-field-initializers GCC/Clang warning (issue 433). 2015-11-24 10:45:16 -08:00
Billy Donahue
93c37d59b0 Merge pull request #632 from nocnokneo/add-cmake-install-rules 
Add CMake install rules for gtest libraries and headers
 2015-11-24 10:35:59 -05:00
Billy Donahue
884dd08d73 Merge pull request #628 from fjunqueira/patch-1 
Adding CMakeLists.txt to the root dir
 2015-11-24 10:35:34 -05:00
Billy Donahue
c4c23548a1 Merge pull request #614 from DukeXar/master 
Fix C++11 clang builds in Travis CI
 2015-11-24 10:34:13 -05:00
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