aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-21Merge from Chromium at DEPS revision 251904android-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-releaseTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ifdd14275a751fa5fa27587c154b28a720497aec1
2014-01-31Merge testing/gtest from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/googletest.git at cc0116f14aa8ad9ab76226d082a96b1005221816 This commit was generated by merge_from_chromium.py. Change-Id: Ibd34693c7c714f631de64072548365ae653821d7
2014-01-29Suppress "Conditional expression is constant" warning on Visual Studio.kosak@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@677 861a406c-534a-0410-8894-cb66d6ee9925
2014-01-29Add GTEST_MOVE macro, to support mocking methods with move-only return types.kosak@google.com
Add GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ git-svn-id: http://googletest.googlecode.com/svn/trunk@676 861a406c-534a-0410-8894-cb66d6ee9925
2014-01-13Make Google Test build cleanly on Visual Studio 2010, 2012, 2013.kosak@google.com
Also improve an error message in gtest_test_utils.py. git-svn-id: http://googletest.googlecode.com/svn/trunk@675 861a406c-534a-0410-8894-cb66d6ee9925
2014-01-12Fix a couple of typos in Google Test's README.kosak@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@674 861a406c-534a-0410-8894-cb66d6ee9925
2014-01-12Define specialization of PrintTo(...) for ::std::tuple.kosak@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@673 861a406c-534a-0410-8894-cb66d6ee9925
2014-01-12Improves documentation on gtest's macros.kosak@google.com
Adds script to automate releasing new version of wiki docs. git-svn-id: http://googletest.googlecode.com/svn/trunk@672 861a406c-534a-0410-8894-cb66d6ee9925
2013-12-10am fbf423ac: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devBaligh Uddin
* commit 'fbf423ac701608666ad972946cdcbe5150499e07': Initial empty repository
2013-12-04Distinguish between C++11 language and library support for <initializer_list>.kosak@google.com
Fix spelling: repositary -> repository. git-svn-id: http://googletest.googlecode.com/svn/trunk@671 861a406c-534a-0410-8894-cb66d6ee9925
2013-12-03Fix warnings encountered with clang -Wall.kosak@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@670 861a406c-534a-0410-8894-cb66d6ee9925
2013-12-03Add MemorySanitizer annotations in gtest printers. Also remove unused ↵kosak@google.com
variable kPathSeparatorString. git-svn-id: http://googletest.googlecode.com/svn/trunk@669 861a406c-534a-0410-8894-cb66d6ee9925
2013-12-03Delete whitespace, and change the return type of ↵kosak@google.com
ImplicitlyConvertible::MakeFrom() to From&. git-svn-id: http://googletest.googlecode.com/svn/trunk@668 861a406c-534a-0410-8894-cb66d6ee9925
2013-11-28Merge from Chromium at DEPS revision 237746Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I9cafa3128d903afe45dc0db73e97b81c6643235d
2013-11-20Merge testing/gtest from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/googletest.git at 74de57c951aedebc5dfe26a27604353432392b98 This commit was generated by merge_from_chromium.py. Change-Id: Ia19a7a698c16d71bd05318a9e25e598c3f8b32e5
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'chromium_org-pre-replicationidea133Baligh Uddin
2013-10-31Initial empty repositoryBaligh Uddin
2013-09-18avoids clash with the max() macro on Windowszhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@663 861a406c-534a-0410-8894-cb66d6ee9925
2013-09-06supports a protocol for catching tests that prematurely exitzhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@662 861a406c-534a-0410-8894-cb66d6ee9925
2013-08-27Updates gtest.xcodeproj to be compatible with OS X 10.8.4 & Xcode 4.6.3zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@661 861a406c-534a-0410-8894-cb66d6ee9925
2013-07-09fixes a typo in CMake script; h/t to Jay Mueller for reporting the issuezhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@659 861a406c-534a-0410-8894-cb66d6ee9925
2013-07-08allows gtest-config.in to work with an absoulte path for @top_srcdir@. h/t ↵zhanyong.wan
to Jimi Xenidis for reporting the issue and the fix. git-svn-id: http://googletest.googlecode.com/svn/trunk@658 861a406c-534a-0410-8894-cb66d6ee9925
2013-07-08makes gtest-death-test_test.cc compile on platforms that don't support death ↵zhanyong.wan
tests; h/t to Steve Robbins for reporting the issue and suggesting the fix. git-svn-id: http://googletest.googlecode.com/svn/trunk@657 861a406c-534a-0410-8894-cb66d6ee9925
2013-06-18Fixes compatibility with C++11: (1 - 1) is no longer a NULL pointer constant.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@655 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-25When --gtest_filter is specified, XML report now doesn't contain information ↵vladlosev
about tests that are filtered out (issue 141). git-svn-id: http://googletest.googlecode.com/svn/trunk@654 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-24Fixes a thread annotation; updates CHANGES for 1.7.0zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@653 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-10prints type/value parameters when listing testszhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@652 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-07Updates the version number to 1.7.0zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@651 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-05Implements support for calling Test::RecordProperty() outside of a test.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@648 861a406c-534a-0410-8894-cb66d6ee9925
2013-04-04Fixes some compatibility issues with STLport.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@647 861a406c-534a-0410-8894-cb66d6ee9925
2013-03-28Merge from Chromium at DEPS revision r190564android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I9e771c0af20ac8987c5bfbf01133c1a63561b456
2013-03-19Replaces unportable == with portable = in configure.ac.zhanyong.wan
Contributed by tk@giga.or.at. git-svn-id: http://googletest.googlecode.com/svn/trunk@646 861a406c-534a-0410-8894-cb66d6ee9925
2013-03-12Prints a useful message when GetParam() is called in a non-parameterized test.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@645 861a406c-534a-0410-8894-cb66d6ee9925
2013-03-11Supports colored output on term type screen-256color.zhanyong.wan
Proposed as a one-line patch by Tom Jakubowski (tom@crystae.net); finished by Zhanyong Wan. git-svn-id: http://googletest.googlecode.com/svn/trunk@644 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-28Fixes unused function warning on Mac, and fixes compatibility with newer GCC.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@643 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-28Fixes a nasty issue in gtest's template instantiation.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@642 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-28Implements RUN_ALL_TESTS() as a function.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@641 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-28Removes an unused variable; also refactors to support an up-comingzhanyong.wan
googlemock change. git-svn-id: http://googletest.googlecode.com/svn/trunk@640 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-27Removes dangling references in make/cmake files.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@639 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-27Adds -pthread and changes -I to -isystem in gtest's build instructions.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@638 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-22Fixes gUnit streaming output format.kosak@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@637 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-22Removes testing::internal::String::Format(), which causes problems as it ↵kosak@google.com
truncates the result at 4096 chars. Also update an obsolete link in comment. git-svn-id: http://googletest.googlecode.com/svn/trunk@636 861a406c-534a-0410-8894-cb66d6ee9925
2013-02-02Fixes an out-dated URL.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@635 861a406c-534a-0410-8894-cb66d6ee9925
2013-01-29Adds the LICENSE file to the distribution.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@634 861a406c-534a-0410-8894-cb66d6ee9925
2012-12-04Merge testing/gtest from ↵Torne (Richard Coles)
https://chromium.googlesource.com/external/googletest.git at a6772271f71672e889776bfe49ec4efd9da036df This commit was generated by merge_from_chromium.py. Change-Id: I94a313f7505dae35f04f587802c3a911d5ca317b
2012-12-03Unbreak building gtest with -std=c++11 on Mac OS X 10.6. Also, better ↵jgm@google.com
support for death tests in iOS simulator. git-svn-id: http://googletest.googlecode.com/svn/trunk@629 861a406c-534a-0410-8894-cb66d6ee9925
2012-11-15Unfortunately, the svn repo is a bit out of date. This commit contains 8jgm@google.com
changes that haven't made it to svn. The descriptions of each change are listed below. - Fixes some python shebang lines. - Add ElementsAreArray overloads to gmock. ElementsAreArray now makes a copy of its input elements before the conversion to a Matcher. ElementsAreArray can now take a vector as input. ElementsAreArray can now take an iterator pair as input. - Templatize MatchAndExplain to allow independent string types for the matcher and matchee. I also templatized the ConstCharPointer version of MatchAndExplain to avoid calls with "char*" from using the new templated MatchAndExplain. - Fixes the bug where the constructor of the return type of ElementsAre() saves a reference instead of a copy of the arguments. - Extends ElementsAre() to accept arrays whose sizes aren't known. - Switches gTest's internal FilePath class from testing::internal::String to std::string. testing::internal::String was introduced when gTest couldn't depend on std::string. It's now deprecated. - Switches gTest & gMock from using testing::internal::String objects to std::string. Some static methods of String are still in use. We may be able to remove some but not all of them. In particular, String::Format() should eventually be removed as it truncates the result at 4096 characters, often causing problems. git-svn-id: http://googletest.googlecode.com/svn/trunk@628 861a406c-534a-0410-8894-cb66d6ee9925
2012-11-14Merge from Chromium at DEPS revision r167172Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I22121ada0a0b5a9ba4b91c7d2855fdf7edab1701
2012-10-08Merge testing/gtest from http://git.chromium.org/external/googletest.git at ↵Torne (Richard Coles)
a92a6f792395e1ad462472d474ab0c76949813fa This commit was generated by merge-from-chromium.py. Change-Id: Iaa1d4ddc2e577b82036ad589783357c64319da72
2012-10-03Initial empty repositoryChad Jones
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 11:47:52 +0000