| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Gennadiy Civil | 2018-07-23 | 1 | -13/+7 |
| |\ | |||||
| | * | Merge pull request #1678 from stianval/master | Gennadiy Civil | 2018-07-23 | 1 | -13/+7 |
| | |\ | | | | | | | Fixing some formatting in docs/primer | ||||
| | | * | Update primer.md | Stian Valle | 2018-07-21 | 1 | -12/+6 |
| | | | | |||||
| | | * | Update primer.md | Stian Valle | 2018-07-21 | 1 | -12/+12 |
| | | | | |||||
| | | * | Update primer.md | Stian Valle | 2018-07-21 | 1 | -7/+7 |
| | |/ | |||||
| * | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-21 | 6 | -32/+67 |
| |\| | |||||
| | * | Merge pull request #1676 from gennadiycivil/master | Gennadiy Civil | 2018-07-20 | 3 | -5/+18 |
| | |\ | | | | | | | code merge | ||||
| | | * | code merge | Gennadiy Civil | 2018-07-20 | 3 | -5/+18 |
| | |/ | |||||
| | * | Merge pull request #1668 from duxiuxing/googletest_for_asam | Gennadiy Civil | 2018-07-20 | 5 | -25/+25 |
| | |\ | | | | | | | Fix warning C4819 in Visual Studio | ||||
| | | * | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-20 | 2 | -7/+29 |
| | | |\ | | |/ | |/| | |||||
| | * | | Merge pull request #1674 from gennadiycivil/master | Gennadiy Civil | 2018-07-19 | 2 | -7/+29 |
| | |\ \ | | | | | | | | | Code Sync | ||||
| | | * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-07-19 | 1 | -0/+3 |
| | | |\ \ | | |/ / | |/| | | |||||
| | | * | | code sync | Gennadiy Civil | 2018-07-19 | 2 | -4/+9 |
| | | | | | |||||
| | | * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-07-18 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | * | | | Code sync | Gennadiy Civil | 2018-07-18 | 1 | -3/+20 |
| | | | | | | |||||
| | | | | * | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio | 杜修杏 | 2018-07-20 | 2 | -4/+4 |
| | | | | | | |||||
| | | | | * | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-19 | 8 | -2122/+1725 |
| | | | | |\ | | |_|_|/ | |/| | | | |||||
| | | | | * | Fix warning C4819: The file contains a character that cannot be represented ↵ | duxiuxing | 2018-07-17 | 3 | -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-jp | Masaru Tsuchiyama | 2018-07-19 | 8 | -2122/+1725 |
| |\| | | | | |||||
| | * | | | | Merge pull request #1669 from syohex/ignore-ds-store | Gennadiy Civil | 2018-07-18 | 1 | -0/+3 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Ignore .DS_Store file | ||||
| | | * | | | Merge branch 'master' into ignore-ds-store | Gennadiy Civil | 2018-07-18 | 7 | -2122/+1722 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #1671 from gennadiycivil/master | Gennadiy Civil | 2018-07-18 | 4 | -205/+4 |
| | |\ \ \ \ | | | |/ / | | |/| | | Code merge | ||||
| | | * | | | Fix link | Gennadiy Civil | 2018-07-18 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Code sync, mostly formatting and removing outdates | Gennadiy Civil | 2018-07-18 | 2 | -203/+2 |
| | | | | | | |||||
| | | * | | | Formatting and a link | Gennadiy Civil | 2018-07-18 | 3 | -3/+3 |
| | |/ / / | |||||
| | * | | | Merge pull request #1667 from hckr/patch-1 | Gennadiy Civil | 2018-07-18 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | Fix broken links to FAQ in primer.md | ||||
| | | * | | | Fix broken links to FAQ in primer.md | Jakub Młokosiewicz | 2018-07-17 | 1 | -2/+2 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #1670 from gennadiycivil/master | Gennadiy Civil | 2018-07-18 | 3 | -1915/+1716 |
| | |\ \ \ | | |/ / | |/| | | Docs sync | ||||
| | | * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-07-17 | 12 | -57/+423 |
| | | |\ \ | | |/ / | |/| | | |||||
| | | * | | Docs sync | Gennadiy Civil | 2018-07-17 | 3 | -1915/+1716 |
| | | | | | |||||
| | | | * | Ignore .DS_Store file | Syohei YOSHIDA | 2018-07-17 | 1 | -0/+3 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-18 | 14 | -376/+785 |
| |\| | | |||||
| | * | | Merge pull request #1655 from AdrianMoranMontes/master | Gennadiy Civil | 2018-07-16 | 1 | -3/+2 |
| | |\ \ | | | | | | | | | Fix issue #1654. | ||||
| | | * \ | Merge branch 'master' into master | Adrian Moran | 2018-07-13 | 10 | -53/+420 |
| | | |\ \ | | |/ / | |/| | | |||||
| | * | | | Merge pull request #1653 from derekmauro/stacktrace | Gennadiy Civil | 2018-07-12 | 9 | -37/+379 |
| | |\ \ \ | | | | | | | | | | | Adds stacktrace support from Abseil to Google Test | ||||
| | | * \ \ | Merge branch 'master' into stacktrace | Derek Mauro | 2018-07-12 | 5 | -320/+387 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #1662 from derekmauro/variant | Gennadiy Civil | 2018-07-12 | 2 | -17/+42 |
| | |\ \ \ \ | | | | | | | | | | | | | Adds the UniversalPrinter for absl::variant. | ||||
| | | * | | | | Adds the UniversalPrinter for absl::variant. | Derek Mauro | 2018-07-12 | 2 | -17/+42 |
| | |/ / / / | |||||
| | | * | | | Pass the --no_stacktrace_support argument to the CMake tests | Derek Mauro | 2018-07-10 | 2 | -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 Test | Derek Mauro | 2018-07-10 | 7 | -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 Moran | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es> | ||||
| | | | * | | Avoid full test in no exceptions are enabled. | Adrian Moran | 2018-07-12 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es> | ||||
| | | | * | | Merge branch 'master' into master | Gennadiy Civil | 2018-07-11 | 3 | -320/+363 |
| | | | |\ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge pull request #1647 from duxiuxing/googletest_for_asam | Gennadiy Civil | 2018-07-11 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | VS2005 with SP1(_MSC_VER=1400) already supports __pragma | ||||
| | | * \ \ \ | Merge branch 'master' into googletest_for_asam | Gennadiy Civil | 2018-07-11 | 2 | -319/+362 |
| | | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | Merge pull request #1656 from gennadiycivil/master | Gennadiy Civil | 2018-07-11 | 2 | -319/+362 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | docs sync, formatting | ||||
| | | * | | | more formatting [skip ci] | Gennadiy Civil | 2018-07-11 | 1 | -17/+0 |
| | | | | | | |||||
| | | * | | | formatting, [ci skip] | Gennadiy Civil | 2018-07-11 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fix heading | Gennadiy Civil | 2018-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [skip ci] | ||||
| | | * | | | Docs sync | Gennadiy Civil | 2018-07-10 | 2 | -313/+373 |
| | |/ / / | | | | | | | | | [ci skip] | ||||
