diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2019-03-20 23:15:58 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2019-03-20 23:15:58 +0000 |
| commit | bda54b8f964b4035dcf5aba394d14ed24370a6f2 (patch) | |
| tree | 2a02c88d42ba47ea03a1be597aea5b22b3331e79 /lib/googletest | |
| parent | 69166928c7d288a25387259acfc6d2af1f920092 (diff) | |
| parent | da1a9eb08c680465ca7d0d798a0f9ed4fff3b62c (diff) | |
| download | src-test2-bda54b8f964b4035dcf5aba394d14ed24370a6f2.tar.gz src-test2-bda54b8f964b4035dcf5aba394d14ed24370a6f2.zip | |
googletest: backport GTEST_SKIP to googletest 1.8.1
This commit backports revisions 00938b2b228f3b70d3d9e51f29a1505bdad43f1e and
59f90a338bce2376b540ee239cf4e269bf6d68ad from googletest's master branch to
our included version of googletest, which is based on 1.8.1. It adds the
GTEST_SKIP feature, which is very useful for a project like FreeBSD where
some tests depend on particular system configurations.
Reviewed by: ngie
Obtained from: github.com/google/googletest
MFC after: 2 months
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/rS345331
Notes
Notes:
svn path=/head/; revision=345353
Diffstat (limited to 'lib/googletest')
| -rw-r--r-- | lib/googletest/gtest_main/tests/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/googletest/gtest_main/tests/Makefile b/lib/googletest/gtest_main/tests/Makefile index 60ec30579b55..d7399ebaad4d 100644 --- a/lib/googletest/gtest_main/tests/Makefile +++ b/lib/googletest/gtest_main/tests/Makefile @@ -18,6 +18,7 @@ GTESTS+= gtest_prod_test GTESTS+= gtest_sole_header_test GTESTS+= googletest-test-part-test GTESTS+= gtest-typed-test_test +GTESTS+= gtest_skip_test GTESTS+= gtest_unittest CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include |