summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* Remove gtest VS2005 projectsrefs/pull/1221/headArkady Shapkin2017-08-2410-1222/+0
|
* Merge branch 'master' into masterrefs/pull/1186/headGennadiy Civil2017-08-2318-0/+1642
|\
| * Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-2218-0/+1642
| | | | | | | | VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
* | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-2257-11926/+471
|\ \
| * \ Merge branch 'master' into masterDaniel Krügler2017-08-2156-11926/+469
| |\ \ | | |/
| | * Adding CMake visibility policy settingrefs/pull/1215/headHenry Schreiner2017-08-181-0/+4
| | | | | | | | | This policy setting will silence a warning when using with a visibility settings on targets. Due to the forced `cmake_minimum_version`, policy settings in CMakeLists calling this one (including the main CMakeLists) are lost, forcing the change to be made here.
| | * Add documentation for pkg-configrefs/pull/1197/headDavid Seifert2017-08-142-0/+152
| | |
| | * Add support for pkgconfigDavid Seifert2017-08-144-3/+41
| | |
| | * Merge pull request #905 from iignatev/masterGennadiy Civil2017-08-141-2/+3
| | |\ | | | | | | | | enable null detection on Solaris Studio 12u4+
| | | * enable null detection on Solaris Studio 12u4+refs/pull/905/headiignatev2016-10-171-2/+3
| | | |
| | * | Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffixGennadiy Civil2017-08-111-4/+8
| | |\ \ | | | | | | | | | | Fix library install destinations
| | | * | Fix library install destinationsrefs/pull/1160/headMatthew Woehlke2017-08-091-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify library install destinations to install .dll's to the correct location (`bin`, not `lib`), and to install other artifacts to the correct platform-dependent location by using GNUInstallDirs. This is required for some distributions (e.g. Fedora) and will fix an issue that otherwise requires those distributions to patch the upstream sources. Also, add options to suppress installation, which may be useful for projects that embed Google Test. Since Google Test is trying to support archaic versions of CMake, a brain-dead fallback (which requires that the user set either LIB_SUFFIX or CMAKE_INSTALL_LIBDIR themselves) is included for versions that predate GNUInstallDirs. Fixes #1161. Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
| | * | | Merge pull request #871 from tommyleo2/masterGennadiy Civil2017-08-111-1/+1
| | |\ \ \ | | | | | | | | | | | | Update Primer.md
| | | * | | Update Primer.mdrefs/pull/871/headtommyleo22016-09-021-1/+1
| | | | | | | | | | | | | | | | | | fix bug in string comparison assertions table where _str2_ is mistakenly written as _str_2
| | * | | | Merge pull request #937 from srz-zumix/fix-gtest-port-typoGennadiy Civil2017-08-111-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | Fix or condition typo ( '|' -> '||' )
| | | * | | | Fix or condition typo ( '|' -> '||' )refs/pull/937/headsrz_zumix2016-11-111-1/+1
| | | | | | |
| | * | | | | Merge pull request #1164 from aninf-wo/hethi/remove-old-docsGennadiy Civil2017-08-1121-11843/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | remove documentation of former versions - it's available in the commit history
| | | * | | | | say "former version" instead of "released version"refs/pull/1164/headHerbert Thielen2017-08-101-1/+1
| | | | | | | |
| | | * | | | | Merge branch 'master' into hethi/remove-old-docsHerbert Thielen2017-08-0916-26/+27
| | | |\ \ \ \ \
| | | * | | | | | remove doc of former versionsHerbert Thielen2017-07-3020-11838/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of former versions is available in the history (e.g. by checking out the appropriate git tags), so there is no need to keep them in parallel to the current documentation.
| | | * | | | | | remove obsolete reference to SVN trunkHerbert Thielen2017-07-301-3/+5
| | | | | | | | |
| | * | | | | | | Merge pull request #1127 from zulkarnine/patch-1Gennadiy Civil2017-08-111-3/+31
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix background color in ColoredPrintf
| | | * | | | | | | Remove duplicate coderefs/pull/1127/headZulkarnine Mahmud2017-07-161-16/+6
| | | | | | | | | |
| | | * | | | | | | Fix assumption for foreground bit offsetZulkarnine Mahmud2017-07-151-3/+16
| | | | | | | | | |
| | | * | | | | | | Remove unnecessary constZulkarnine Mahmud2017-06-291-1/+1
| | | | | | | | | |
| | | * | | | | | | Add helper functions for text color calculationZulkarnine Mahmud2017-06-291-24/+25
| | | | | | | | | |
| | | * | | | | | | Fix a problem when bg_color == fg_colorZulkarnine Mahmud2017-06-221-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invert the intensity bit if the background_color == foreground_color
| | | * | | | | | | Add background_mask instead of using magic numberZulkarnine Mahmud2017-06-211-1/+2
| | | | | | | | | |
| | | * | | | | | | Fix background color in ColoredPrintfZulkarnine Mahmud2017-06-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use existing background color for Widows' console window. This fixes a problem where the background color for ColoredPrintf would be BLACK even if the user's console is using a different BG color.
| | * | | | | | | | Merge pull request #1192 from eduherminio/masterGennadiy Civil2017-08-114-12/+11
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Minor style fixes
| | | * | | | | | | | Minor style fixesrefs/pull/1192/headEduardo Caceres2017-08-104-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typos, punctuation & broken links
| | * | | | | | | | | Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-1111-28/+146
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adding Bazel build to googletest (initial version )
| | | * | | | | | | | | Addressing Commentsrefs/pull/1191/headmisterg2017-08-101-46/+22
| | | | | | | | | | | |
| | | * | | | | | | | | Added Copyrightmisterg2017-08-101-4/+32
| | | | | | | | | | | |
| | | * | | | | | | | | Initial Revision, review 164634031misterg2017-08-102-3/+1
| | | | | | | | | | | |
| | | * | | | | | | | | WIPmisterg2017-08-091-29/+3
| | | | | | | | | | | |
| | | * | | | | | | | | WIP, win testingmisterg2017-08-081-4/+7
| | | | | | | | | | | |
| | | * | | | | | | | | WIP, windows testingmisterg2017-08-081-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | WIP, windows testingmisterg2017-08-081-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | WIP, windows testingmisterg2017-08-081-3/+9
| | | | | | | | | | | |
| | | * | | | | | | | | WIPmisterg2017-08-081-0/+133
| | | | | | | | | | | |
| | | * | | | | | | | | Samples changes upstreamingmisterg2017-08-072-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Samples changes upstreamingmisterg2017-08-079-18/+15
| | | | | | | | | | | |
| | | * | | | | | | | | WIPmisterg2017-08-0110-28/+31
| | | | | | | | | | | |
| | * | | | | | | | | | Merge pull request #1178 from aninf-wo/hethi/testsuite-hintGennadiy Civil2017-08-101-0/+34
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | add note about different definitions of Test Case
| | | * | | | | | | | | clarify distinction regarding Test Caserefs/pull/1178/headHerbert Thielen2017-08-101-5/+5
| | | | | | | | | | | |
| | | * | | | | | | | | be more specific on Test CaseHerbert Thielen2017-08-091-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | add note about different definitions of Test CaseHerbert Thielen2017-08-051-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are contradictory definitions of the term "test case", so prepare new users in Primer.md to avoid confusion.
| | * | | | | | | | | | Punctuationrefs/pull/1185/headEduardo Cáceres2017-08-091-2/+2
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | Missing periods
| | * | | | | | | | | Merge pull request #675 from theHacker/masterGennadiy Civil2017-08-081-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix: Markdown in V1_7_Primer.md