aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpGennadiy Civil2018-07-231-13/+7
|\
| * Merge pull request #1678 from stianval/masterGennadiy Civil2018-07-231-13/+7
| |\ | | | | | | Fixing some formatting in docs/primer
| | * Update primer.mdStian Valle2018-07-211-12/+6
| | |
| | * Update primer.mdStian Valle2018-07-211-12/+12
| | |
| | * Update primer.mdStian Valle2018-07-211-7/+7
| |/
* | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-216-32/+67
|\|
| * Merge pull request #1676 from gennadiycivil/masterGennadiy Civil2018-07-203-5/+18
| |\ | | | | | | code merge
| | * code mergeGennadiy Civil2018-07-203-5/+18
| |/
| * Merge pull request #1668 from duxiuxing/googletest_for_asamGennadiy Civil2018-07-205-25/+25
| |\ | | | | | | Fix warning C4819 in Visual Studio
| | * Merge branch 'master' into googletest_for_asamduxiuxing2018-07-202-7/+29
| | |\ | | |/ | |/|
| * | Merge pull request #1674 from gennadiycivil/masterGennadiy Civil2018-07-192-7/+29
| |\ \ | | | | | | | | Code Sync
| | * \ Merge branch 'master' into masterGennadiy Civil2018-07-191-0/+3
| | |\ \ | | |/ / | |/| |
| | * | code syncGennadiy Civil2018-07-192-4/+9
| | | |
| | * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-07-180-0/+0
| | |\ \
| | * | | Code syncGennadiy Civil2018-07-181-3/+20
| | | | |
| | | | * Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-202-4/+4
| | | | |
| | | | * Merge branch 'master' into googletest_for_asamduxiuxing2018-07-198-2122/+1725
| | | | |\ | | |_|_|/ | |/| | |
| | | | * Fix warning C4819: The file contains a character that cannot be represented ↵duxiuxing2018-07-173-21/+21
| | | | | | | | | | | | | | | | | | | | in the current code page (936). Save the file in Unicode format to prevent data loss
* | | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-198-2122/+1725
|\| | | |
| * | | | Merge pull request #1669 from syohex/ignore-ds-storeGennadiy Civil2018-07-181-0/+3
| |\ \ \ \ | | |_|/ / | |/| | | Ignore .DS_Store file
| | * | | Merge branch 'master' into ignore-ds-storeGennadiy Civil2018-07-187-2122/+1722
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1671 from gennadiycivil/masterGennadiy Civil2018-07-184-205/+4
| |\ \ \ \ | | | |/ / | | |/| | Code merge
| | * | | Fix linkGennadiy Civil2018-07-181-1/+1
| | | | |
| | * | | Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| | | | |
| | * | | Formatting and a linkGennadiy Civil2018-07-183-3/+3
| |/ / /
| * | | Merge pull request #1667 from hckr/patch-1Gennadiy Civil2018-07-181-2/+2
| |\ \ \ | | | | | | | | | | Fix broken links to FAQ in primer.md
| | * | | Fix broken links to FAQ in primer.mdJakub Młokosiewicz2018-07-171-2/+2
| | | |/ | | |/|
| * | | Merge pull request #1670 from gennadiycivil/masterGennadiy Civil2018-07-183-1915/+1716
| |\ \ \ | | |/ / | |/| | Docs sync
| | * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-07-1712-57/+423
| | |\ \ | | |/ / | |/| |
| | * | Docs syncGennadiy Civil2018-07-173-1915/+1716
| | | |
| | | * Ignore .DS_Store fileSyohei YOSHIDA2018-07-171-0/+3
| | |/ | |/|
* | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-1814-376/+785
|\| |
| * | Merge pull request #1655 from AdrianMoranMontes/masterGennadiy Civil2018-07-161-3/+2
| |\ \ | | | | | | | | Fix issue #1654.
| | * \ Merge branch 'master' into masterAdrian Moran2018-07-1310-53/+420
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1653 from derekmauro/stacktraceGennadiy Civil2018-07-129-37/+379
| |\ \ \ | | | | | | | | | | Adds stacktrace support from Abseil to Google Test
| | * \ \ Merge branch 'master' into stacktraceDerek Mauro2018-07-125-320/+387
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1662 from derekmauro/variantGennadiy Civil2018-07-122-17/+42
| |\ \ \ \ | | | | | | | | | | | | Adds the UniversalPrinter for absl::variant.
| | * | | | Adds the UniversalPrinter for absl::variant.Derek Mauro2018-07-122-17/+42
| |/ / / /
| | * | | Pass the --no_stacktrace_support argument to the CMake testsDerek Mauro2018-07-102-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | This does the same thing to the CMake tests that is done to the Bazel tests, and now makes the CMake tests pass.
| | * | | Adds stacktrace support from Abseil to Google TestDerek Mauro2018-07-107-48/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the ability to generate stacktraces in Google Test on both failures of assertions/expectations and on crashes. The stacktrace support is conditionally available only when using Abseil with Google Test. To use this support, run the test under Bazel with a command like this: bazel test --define absl=1 --test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1 //path/to/your:test The "--define absl=1" part enables stacktraces on assertion/expectation failures. The "--test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1" part enables the signal handler that logs a stacktrace in the event of a crash (this also requires the "--define absl=1" part). This is not the default since it may interfere with existing tests.
| | | * | Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| | | * | Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| | | * | Merge branch 'master' into masterGennadiy Civil2018-07-113-320/+363
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #1647 from duxiuxing/googletest_for_asamGennadiy Civil2018-07-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | VS2005 with SP1(_MSC_VER=1400) already supports __pragma
| | * \ \ \ Merge branch 'master' into googletest_for_asamGennadiy Civil2018-07-112-319/+362
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1656 from gennadiycivil/masterGennadiy Civil2018-07-112-319/+362
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | docs sync, formatting
| | * | | more formatting [skip ci]Gennadiy Civil2018-07-111-17/+0
| | | | |
| | * | | formatting, [ci skip]Gennadiy Civil2018-07-111-1/+1
| | | | |
| | * | | Fix heading Gennadiy Civil2018-07-101-1/+1
| | | | | | | | | | | | | | | [skip ci]
| | * | | Docs syncGennadiy Civil2018-07-102-313/+373
| |/ / / | | | | | | | | [ci skip]