aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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
2012-09-19Improves Android support (by David Turner).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@625 861a406c-534a-0410-8894-cb66d6ee9925
2012-09-06Removes obsolete debug code.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@623 861a406c-534a-0410-8894-cb66d6ee9925
2012-09-06Fixes gtest-tuple.h in Visual C++ 7.1.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@622 861a406c-534a-0410-8894-cb66d6ee9925
2012-08-14Fixed Native Client build of gtest when using glibc (by Ben Smith).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@621 861a406c-534a-0410-8894-cb66d6ee9925
2012-08-14Prevents pump.py from splitting long IWYU pragma lines.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@620 861a406c-534a-0410-8894-cb66d6ee9925
2012-07-12fixes a problem in which we pass the address one byte ↵jgm@google.com
~/svn/googletest/trunk after the end of stack space in a call to clone(). According to Linux's man page on clone(), the 'stack' parameter usually points to the topmost address of the memory space set up for the child stack. The existing code points one byte after the end git-svn-id: http://googletest.googlecode.com/svn/trunk@618 861a406c-534a-0410-8894-cb66d6ee9925
2012-07-09added defines for iOSjgm@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@617 861a406c-534a-0410-8894-cb66d6ee9925
2012-06-07Improves gtest's failure messages. In particulars, char pointers andzhanyong.wan
char arrays are not escapped properly. git-svn-id: http://googletest.googlecode.com/svn/trunk@616 861a406c-534a-0410-8894-cb66d6ee9925
2012-05-31Fixes threading annotations and compatibility with C++11, which doesn'tzhanyong.wan
allow exepctions to be thrown in a destructor. git-svn-id: http://googletest.googlecode.com/svn/trunk@615 861a406c-534a-0410-8894-cb66d6ee9925
2012-05-02Teach gtest to autodetect rtti support with clang (by Nico Weber).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@614 861a406c-534a-0410-8894-cb66d6ee9925
2012-04-02Added support for platforms where pthread_t is a struct rather than an integraljgm@google.com
type. git-svn-id: http://googletest.googlecode.com/svn/trunk@613 861a406c-534a-0410-8894-cb66d6ee9925
2012-03-09Misc small updates to some debug death code, and to messages streaming to macrosjgm@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@612 861a406c-534a-0410-8894-cb66d6ee9925
2012-01-27Locking for Notification class.jgm@google.com
git-svn-id: http://googletest.googlecode.com/svn/trunk@610 861a406c-534a-0410-8894-cb66d6ee9925
2012-01-17Adds file and line information to the "message", which is used as the summaryjgm@google.com
of a failure. git-svn-id: http://googletest.googlecode.com/svn/trunk@609 861a406c-534a-0410-8894-cb66d6ee9925
2011-11-28Removes spurious semicolon.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@608 861a406c-534a-0410-8894-cb66d6ee9925
2011-11-04Improves conformance to the Google C++ Style Guide (by Greg Miller).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@607 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-28Adds support for detection of running in death test child processes.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@606 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-24Adds empty methods to Mutex on platforms where Google Test is not ↵vladlosev
thread-safe. This will support a reentrancy fix in Google Mock. git-svn-id: http://googletest.googlecode.com/svn/trunk@605 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-24Expressed the thread-safety annotations in code, replacing the existing ↵vladlosev
comment-based system (by Aaron Jacobs). git-svn-id: http://googletest.googlecode.com/svn/trunk@604 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-24Changes to fix gtest-printers_test on VC++ 2010.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@603 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-14Simplifies test assertions in sample5.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@602 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-05Implements the timestamp attribute for the testsuites element in the output ↵vladlosev
XML (external contribution by Dirk Meister). git-svn-id: http://googletest.googlecode.com/svn/trunk@600 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-05Adds ability to inject death test child arguments for test purposes.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@599 861a406c-534a-0410-8894-cb66d6ee9925
2011-10-05Fixes test failure on 32-bit Ubuntu.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@598 861a406c-534a-0410-8894-cb66d6ee9925
2011-09-26Adds a new macro simplifying use of snprinf on MS platforms.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@597 861a406c-534a-0410-8894-cb66d6ee9925
2011-09-26Fixes C++0x compatibility problems.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@596 861a406c-534a-0410-8894-cb66d6ee9925
2011-09-16Simplifies the implementatoin of the test result printer; by Ulfar Erlingssonzhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@595 861a406c-534a-0410-8894-cb66d6ee9925
2011-09-09Renames the license file.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@593 861a406c-534a-0410-8894-cb66d6ee9925
2011-09-09Ignore SIGPROF signal during clone()/fork() call. clone()/fork() call hangs ↵vladlosev
permanently if it consumes more cpu than the SIGPROF signal timer interval (by Nabeel Mian). git-svn-id: http://googletest.googlecode.com/svn/trunk@592 861a406c-534a-0410-8894-cb66d6ee9925
2011-08-22Adds explanation on how to build the Xcode project under Xcode 4+ to README.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@589 861a406c-534a-0410-8894-cb66d6ee9925
2011-08-16Fixes a user reported test break (modifying a dict while iterating).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@588 861a406c-534a-0410-8894-cb66d6ee9925
2011-07-11Fixes a resource leak in gtest-port_test (by Haruka Iwao).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@587 861a406c-534a-0410-8894-cb66d6ee9925
2011-06-20QNX compatibility patch (by Haruka Iwao).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@586 861a406c-534a-0410-8894-cb66d6ee9925
2011-06-13Suppresses the tail-call optimization of StackGrowsDown() in GCC4.6 (by Paul ↵vladlosev
Pluzhnikov). git-svn-id: http://googletest.googlecode.com/svn/trunk@585 861a406c-534a-0410-8894-cb66d6ee9925
2011-06-13Fixes broken build on VC++ 7.1.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@584 861a406c-534a-0410-8894-cb66d6ee9925
2011-05-20Adds support for building Google Mock as a shared library (DLL).vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@583 861a406c-534a-0410-8894-cb66d6ee9925
2011-05-12Simplifies the code by removing condfitional section that is no longer ↵vladlosev
necessary. git-svn-id: http://googletest.googlecode.com/svn/trunk@582 861a406c-534a-0410-8894-cb66d6ee9925
2011-05-03Adds support for death tests in OpenBSD (by Paweł Hajdan Jr.)vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@581 861a406c-534a-0410-8894-cb66d6ee9925
2011-04-21Makes generation of fused sources contingent on availability of Python.vladlosev
git-svn-id: http://googletest.googlecode.com/svn/trunk@580 861a406c-534a-0410-8894-cb66d6ee9925
2011-04-15Fixes XL C++ 10.1 compiler errors (based on patch by Hady Zalek); cleans up ↵zhanyong.wan
formatting of GTEST_NO_INLINE_. git-svn-id: http://googletest.googlecode.com/svn/trunk@572 861a406c-534a-0410-8894-cb66d6ee9925
2011-04-14fixes a problem caused by gcc 4.6 optimization (by Paul Pluzhnikov)zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@571 861a406c-534a-0410-8894-cb66d6ee9925
2011-04-14Adds Pasi to CONTRIBUTORS and documents the latest changes.zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@570 861a406c-534a-0410-8894-cb66d6ee9925
2011-04-12Fixes Sun C++ compiler errors (by Pasi Valminen)zhanyong.wan
git-svn-id: http://googletest.googlecode.com/svn/trunk@569 861a406c-534a-0410-8894-cb66d6ee9925
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:32:37 +0000