Masaru Tsuchiyama
534570b5bd
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-21 09:18:54 +09:00
Gennadiy Civil
2a151c93c1
Merge pull request #1676 from gennadiycivil/master
...
code merge
2018-07-20 11:46:26 -04:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
c62c79432b
Merge pull request #1668 from duxiuxing/googletest_for_asam
...
Fix warning C4819 in Visual Studio
2018-07-20 10:30:23 -04:00
duxiuxing
d8db0ca9cf
Merge branch 'master' into googletest_for_asam
2018-07-20 06:16:21 +08:00
杜修杏
2eb4396007
Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio
2018-07-20 06:15:13 +08:00
Gennadiy Civil
6ce9b98f54
Merge pull request #1674 from gennadiycivil/master
...
Code Sync
2018-07-19 13:31:15 -04:00
Gennadiy Civil
61b8197217
Merge branch 'master' into master
2018-07-19 12:54:43 -04:00
Gennadiy Civil
0c17888bcf
code sync
2018-07-19 12:42:39 -04:00
duxiuxing
5b19054b02
Merge branch 'master' into googletest_for_asam
2018-07-19 18:38:20 +08:00
Masaru Tsuchiyama
40cd5d1170
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-19 06:51:13 +09:00
Gennadiy Civil
1370e7658b
Merge pull request #1669 from syohex/ignore-ds-store
...
Ignore .DS_Store file
2018-07-18 14:20:37 -04:00
Gennadiy Civil
a3509a5aa4
Merge branch 'master' of https://github.com/google/googletest
2018-07-18 14:15:58 -04:00
Gennadiy Civil
43163c19d5
Merge branch 'master' into ignore-ds-store
2018-07-18 14:09:06 -04:00
Gennadiy Civil
4235fff7f4
Merge pull request #1671 from gennadiycivil/master
...
Code merge
2018-07-18 11:54:56 -04:00
Gennadiy Civil
3530ab9e43
Code sync
2018-07-18 11:51:14 -04:00
Gennadiy Civil
d41bfd732f
Fix link
2018-07-18 11:38:18 -04:00
Gennadiy Civil
8d07cfd053
Code sync, mostly formatting and removing outdates
2018-07-18 11:30:36 -04:00
Gennadiy Civil
7e73a7ae6e
Formatting and a link
2018-07-18 11:17:19 -04:00
Gennadiy Civil
20ef7944a4
Merge pull request #1667 from hckr/patch-1
...
Fix broken links to FAQ in primer.md
2018-07-18 10:21:46 -04:00
Gennadiy Civil
2211061e64
Merge pull request #1670 from gennadiycivil/master
...
Docs sync
2018-07-18 10:17:18 -04:00
Masaru Tsuchiyama
234958def5
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
2018-07-18 08:03:49 +09:00
Gennadiy Civil
4abbb774c3
Merge branch 'master' of https://github.com/google/googletest
2018-07-17 17:47:54 -04:00
Gennadiy Civil
5437926b22
Docs sync
2018-07-17 17:47:25 -04:00
Syohei YOSHIDA
a091b75332
Ignore .DS_Store file
2018-07-17 18:39:29 +09:00
duxiuxing
65a49a73f0
Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss
2018-07-17 15:46:47 +08:00
Jakub Młokosiewicz
021c308069
Fix broken links to FAQ in primer.md
2018-07-17 00:49:31 +02:00
Gennadiy Civil
077ee54cef
Merge pull request #1655 from AdrianMoranMontes/master
...
Fix issue #1654 .
2018-07-16 11:17:00 -04:00
Adrian Moran
ee3885fbd6
Merge branch 'master' into master
2018-07-13 12:07:00 +02:00
Adrian Moran
cbd07191f4
Put ifdef guard after the includes.
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Gennadiy Civil
b4d4438df9
Merge pull request #1653 from derekmauro/stacktrace
...
Adds stacktrace support from Abseil to Google Test
2018-07-12 17:34:21 -04:00
Derek Mauro
82670da613
Merge branch 'master' into stacktrace
2018-07-12 16:51:04 -04:00
Gennadiy Civil
df0d0a3f33
Merge pull request #1662 from derekmauro/variant
...
Adds the UniversalPrinter for absl::variant.
2018-07-12 15:51:13 -04:00
Derek Mauro
6c7878a151
Adds the UniversalPrinter for absl::variant.
2018-07-12 13:46:50 -04:00
Adrian Moran
0acdf79642
Avoid full test in no exceptions are enabled.
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-12 15:10:08 +02:00
Gennadiy Civil
a5190506e7
Merge branch 'master' into master
2018-07-11 13:22:20 -04:00
Gennadiy Civil
41f0e24335
Merge pull request #1647 from duxiuxing/googletest_for_asam
...
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
2018-07-11 12:00:02 -04:00
Gennadiy Civil
d91b0de99e
Merge branch 'master' into googletest_for_asam
2018-07-11 10:08:04 -04:00
Gennadiy Civil
7eae4ea4e1
Merge pull request #1656 from gennadiycivil/master
...
docs sync, formatting
2018-07-11 09:56:14 -04:00
Gennadiy Civil
36066cfecf
more formatting [skip ci]
2018-07-11 09:42:48 -04:00
Gennadiy Civil
74cccf494a
formatting, [ci skip]
2018-07-11 09:38:47 -04:00
Adrian Moran
93bfdde0ee
Fix issue #1654 .
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-11 14:59:01 +02:00
Gennadiy Civil
4f9194286c
Fix heading
...
[skip ci]
2018-07-10 17:30:28 -04:00
Gennadiy Civil
50daf299c2
Docs sync
...
[ci skip]
2018-07-10 17:16:03 -04:00
Derek Mauro
d772e2039b
Pass the --no_stacktrace_support argument to the CMake tests
...
This does the same thing to the CMake tests that is done to the
Bazel tests, and now makes the CMake tests pass.
2018-07-10 15:39:23 -04:00
Derek Mauro
4c41787764
Adds stacktrace support from Abseil to Google Test
...
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.
2018-07-10 14:30:42 -04:00
Masaru Tsuchiyama
4bcc9b9807
This closes #1595 : fix compiler error with Visual Studio 2017 on Win10 JP.
...
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.
To fix the errors, remove non-ASCII charactors.
2018-06-30 21:46:41 +09:00
杜修杏
03ea2fdecb
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
2018-06-29 11:19:46 +08:00
Gennadiy Civil
ba96d0b116
Merge pull request #1622 from rohanjoyce/bazel_test_filter
...
Support bazel test filtering
2018-06-14 16:56:27 -04:00
Rohan Joyce
0563b52d3a
Eliminate GTEST_TEST_FILTER_ENV_VAR_.
...
GTEST_TEST_FILTER_ENV_VAR_ was used to specify an environment variable to obtain
the default test filter from. By default it was unset which broke
"--test_filter" for bazel. This CL eliminates GTEST_TEST_FILTER_ENV_VAR_ and
explicitly obtains the default test filter from the environment variable
TESTBRIDGE_TEST_ONLY if it exists.
2018-06-14 15:45:55 -04:00