summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #783 from tobbi/cppcheck_perf_fixesGennadiy Civil2017-09-012-5/+5
|\ | | | | Performance fixes reported by cppcheck
| * Performance fixes reported by cppcheckrefs/pull/783/headTobias Markus2016-05-222-6/+5
| |
* | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-011-1/+1
|\ \ | | | | | | Wrong version reported (1.7.0 should be 1.8.0)
| * \ Merge branch 'master' into wrong-version-reportedrefs/pull/1011/headGennadiy Civil2017-08-2170-12089/+731
| |\ \
| * | | Wrong version reported (1.7.0 should be 1.8.0)Olivier Clavel2017-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | `gtest-config --version` reports wrong version. Made against master branch but please note that this affects tag release-1.8.0 and the distribution tarballs.
* | | | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-typeGennadiy Civil2017-09-011-11/+21
|\ \ \ \ | | | | | | | | | | use cmake build type defined in .travis.yml for travis builds
| * \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typerefs/pull/1235/headHerbert Thielen2017-08-311-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeGennadiy Civil2017-08-311-2/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-313-2/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-301-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | create different python based tests for single and multi configuration build ↵Herbert Thielen2017-08-301-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generators
| * | | | | | | | Revert "ask cmake for per-configuration output subdir"Herbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e. Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't help here.
| * | | | | | | | ask cmake for per-configuration output subdirHerbert Thielen2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On single-configuration build systems as Makefile Generators, there is no subdirectory for the configuration in the build tree - therefore ask cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on single-configuration build systems (Linux et al.).
| * | | | | | | | remove obsolete comment regarding python tests on linuxHerbert Thielen2017-08-301-2/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-linksGennadiy Civil2017-08-313-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | change links from former code.google.com to current github repository
| * | | | | | | | change links from former code.google.com to current github repositoryrefs/pull/1241/headHerbert Thielen2017-08-313-3/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' into hethi/fix-faq-example-commentrefs/pull/1240/headHerbert Thielen2017-08-311-2/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesrefs/pull/865/headClaus Stovgaard2017-08-3197-13318/+2454
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitignore
| * | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-04-056-10/+120
| |\ \ \ \ \ \ \
| * | | | | | | | Moved the ignoring of *.pyc files to top level for also covering googlemock ↵Claus Stovgaard2016-08-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python scripts.
* | | | | | | | | fix example's commentHerbert Thielen2017-08-311-2/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Removed "Trivial" refs/pull/1237/headGennadiy Civil2017-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Who knows? may not be very trivial given the code drift between internal and OSS
* | | | | | | | removed internal link ( not allowed in OSS)Gennadiy Civil2017-08-301-1/+1
| | | | | | | |
* | | | | | | | Note that it is preferable for Googlers to create a CL internally firstScott Graham2017-08-301-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'master' into masterrefs/pull/1234/headGennadiy Civil2017-08-302-4/+4
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuiderefs/pull/1236/headHerbert Thielen2017-08-301-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | fixes issue #1087
| * | | | | | fix typo in comment and string (SetUpTestCase)Herbert Thielen2017-08-291-2/+2
| | | | | | |
* | | | | | | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
|/ / / / / /
* | | | | | 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
generated by cgit v0.12 at 2024-08-28 12:21:40 (GMT)