diff options
author | Kyle Evans <kevans@FreeBSD.org> | 2019-08-22 19:10:31 +0000 |
---|---|---|
committer | Kyle Evans <kevans@FreeBSD.org> | 2019-08-22 19:10:31 +0000 |
commit | 92a8983babc3effa5b7339864521857b5f284805 (patch) | |
tree | 757f7933819900968837051de66d1c9bad63f8b2 /tests | |
parent | 299e2c58b71c1c2a790182de57c36f98ba1e1df9 (diff) | |
download | src-92a8983babc3effa5b7339864521857b5f284805.tar.gz src-92a8983babc3effa5b7339864521857b5f284805.zip |
Fix the build with WITHOUT_GOOGLETEST
Attempting to build the fusefs tests WITHOUT_GOOGLETEST will result in an
error if the host system or sysroot doesn't already have googletest headers
in /usr/include/private (e.g. host built/installed WITHOUT_GOOGLETEST, clean
cross-buildworld WITHOUT_GOOGLETEST).
Reviewed by: asomers
Differential Revision: https://reviews.freebsd.org/D21367
Notes
Notes:
svn path=/head/; revision=351399
Diffstat (limited to 'tests')
-rw-r--r-- | tests/sys/fs/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile index 99d909b140de..6769f2182e79 100644 --- a/tests/sys/fs/Makefile +++ b/tests/sys/fs/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +.include <src.opts.mk> .include <bsd.compiler.mk> PACKAGE= tests @@ -9,7 +10,8 @@ TESTSDIR= ${TESTSBASE}/sys/fs TESTSRC= ${SRCTOP}/contrib/netbsd-tests/fs #TESTS_SUBDIRS+= nullfs # XXX: needs rump -.if ${COMPILER_FEATURES:Mc++14} +# fusefs tests cannot be compiled/used without the googletest infrastructure. +.if ${COMPILER_FEATURES:Mc++14} && ${MK_GOOGLETEST} != "no" TESTS_SUBDIRS+= fusefs .endif TESTS_SUBDIRS+= tmpfs |