summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1950 from benjamincarman/makefixGennadiy Civil2018-11-021-1/+1
|\ \ | | | | | | Updating Sample Makefile to Specify C++11
| * \ Merge branch 'master' into makefixGennadiy Civil2018-11-011-0/+15
| |\ \ | |/ / |/| |
* | | Googletest exportmisterg2018-11-011-0/+15
| | | | | | | | | | | | | | | | | | Adding GTEST_INTERNAL_DEPRECATED ability to mark deprecated PiperOrigin-RevId: 219515184
| * | Added line to sample Makefile in googletest/googletest/make to specify use ↵Benjamin Carman2018-11-011-1/+1
|/ / | | | | | | of C++11 in CXXFLAGS as required by the system
* | Merge pull request #1948 from jerryturcios08/masterGennadiy Civil2018-10-311-1/+1
|\ \ | | | | | | Correct grammatical error in googlemock's README.md file
| * | Correct grammatical error in README.mdJerry Turcios2018-10-311-1/+1
| | |
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-3115-90/+53
| |\ \ | |/ / |/| |
* | | Googletest exportAbseil Team2018-10-301-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Fuchsia] Create the death test child process in a separate job. This creates a separate job to launch the child process into. The exception port can then be attached to the new job before the child process is launched, solving a potential race condition. PiperOrigin-RevId: 219366531
* | | Googletest exportmisterg2018-10-3013-80/+30
| | | | | | | | | | | | | | | | | | Remove scoped_ptr replace with std::unique_ptr PiperOrigin-RevId: 219291284
* | | Googletest exportAbseil Team2018-10-301-2/+3
| | | | | | | | | | | | | | | | | | Fix broken Fuchsia cc_test. PiperOrigin-RevId: 219170936
* | | Merge pull request #1945 from akonradi/optional-matcher-docGennadiy Civil2018-10-301-0/+1
|\ \ \ | | | | | | | | Add Optional() to the cheat sheet doc.
| * | | Add Optional() to the cheat sheet doc.Alex Konradi2018-10-291-0/+1
|/ / / | | | | | | | | | | | | The Optional() matcher is otherwise undocumented except in the source. This patch adds it to the cheat sheet for better visibility.
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-2936-811/+252
| |\ \ | |/ / |/| |
* | | Googletest exportmisterg2018-10-291-1/+0
| | | | | | | | | | | | | | | | | | Remove last traces of gtest-linked_ptr.h PiperOrigin-RevId: 219164781
* | | Merge pull request #1941 from barkovv:masterGennadiy Civil2018-10-2915-185/+157
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 219134349
| * | | Replaced all NULLs with nullptr in googlemockVadim Barkov2018-10-285-10/+10
| | | |
| * | | Replaced all NULLs with nullptr in googletestVadim Barkov2018-10-2810-73/+73
| | | |
* | | | Googletest exportmisterg2018-10-2926-625/+95
|/ / / | | | | | | | | | | | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 219129336
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-281-51/+107
| |\ \ | |/ / |/| |
* | | Googletest exportAbseil Team2018-10-261-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | [Fuchsia] Make the child process stderr redirection use a socket. This changes the stderr redirection mechanism for the child process in Fuchsia death tests to use a Zircon socket rather than fd redirection. This should improve performance and reliability of the redirection process. This also includes some minor style cleanups. PiperOrigin-RevId: 218903196
* | | Googletest exportAbseil Team2018-10-2624-84/+624
| | | | | | | | | | | | | | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218618184
* | | Googletest exportmisterg2018-10-2624-624/+84
| | | | | | | | | | | | | | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218571466
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-244-11/+37
| |\ \ | |/ / |/| |
* | | Merge pull request #1934 from jeffvandyke/patch-2Gennadiy Civil2018-10-241-6/+6
|\ \ \ | | | | | | | | Change CMake googletest download location in docs
| * | | Change CMake googletest download location in docsJeff VanDyke2018-10-241-6/+6
|/ / / | | | | | | | | | Change CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR Able to use in a subfolder's CMakeLists.txt
* | | Merge pull request #1890 from peterjc123:clang_fixGennadiy Civil2018-10-241-1/+8
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 218515152
| * | | Disable extensions and force standardpeter2018-10-241-0/+2
| | | |
| * | | Revert previous changespeter2018-10-241-4/+0
| | | |
| * | | Fix -std=c++11 flagpeter2018-10-242-1/+10
| | | |
* | | | Googletest exportdurandal2018-10-242-4/+23
|/ / / | | | | | | | | | | | | | | | Honor GTEST_SKIP() in SetUp(). PiperOrigin-RevId: 218387359
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-241-0/+9
| |\ \ | |/ / |/| |
* | | Merge pull request #1929 from goatshriek/cmake-cxx11-flagGennadiy Civil2018-10-231-0/+9
|\ \ \ | | | | | | | | add documentation of manual c++11 specification
| * | | add documentation of manual c++11 specificationJoel Anderson2018-10-231-0/+9
|/ / / | | | | | | | | | | | | | | | | | | Per #1883, builds of Google Test may fail if the version C++ is not manually set to C++11 during the build process. Signed-off-by: Joel Anderson <joelanderson333@gmail.com>
| * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-234-1/+52
| |\ \ | |/ / |/| |
* | | Update advanced.mdGennadiy Civil2018-10-231-1/+1
| | | | | | | | | Fixes #1802
* | | Merge pull request #1911 from BrukerJWD:isniceGennadiy Civil2018-10-235-3/+54
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 218384341
| * | | Removed last reference to internal::kDefaultJonathan Wendeborn2018-10-161-1/+0
| | | |
| * | | Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isniceJonathan Wendeborn2018-10-16338-42718/+22620
| |\ \ \
| | * \ \ Merge branch 'master' into isniceBrukerJWD2018-10-16338-42718/+22620
| | |\ \ \
| * | | | | Use existing Mock::GetReactionOnUninterestingCalls()Jonathan Wendeborn2018-10-161-17/+3
| |/ / / /
| * | | | Don't fully qualify enum memberJonathan Wendeborn2018-10-162-8/+5
| | | | |
| * | | | Added Mock::IsNaggy, IsNice, and IsStrictJonathan Wendeborn2018-10-163-0/+69
| | | | |
* | | | | Update advanced.mdGennadiy Civil2018-10-231-2/+1
| | | | | | | | | | | | | | | Fixes #1755
* | | | | Update advanced.mdGennadiy Civil2018-10-231-1/+1
| | | | | | | | | | | | | | | Fixes #1925
* | | | | Merge pull request #1927 from svg153/patch-1Gennadiy Civil2018-10-231-0/+1
|\ \ \ \ \ | | | | | | | | | | | | ACTION table format
| * | | | | ACTION table formatSergio Valverde2018-10-231-0/+1
|/ / / / /
| | | * | Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-2214-58/+222
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Googletest exportAbseil Team2018-10-223-37/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ValuesArray to require much less template instantiation depth. PiperOrigin-RevId: 218170842
* | | | | Merge pull request #1839 from Peter-Levine:python3-testsGennadiy Civil2018-10-227-13/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | PiperOrigin-RevId: 217925156
| * \ \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-10-1952-9470/+1895
| |\ \ \ \ \
OpenPOWER on IntegriCloud