svn commit: r352356 - stable/12/tests/sys/fs
Kyle Evans
kevans at FreeBSD.org
Sun Sep 15 14:37:51 UTC 2019
Author: kevans
Date: Sun Sep 15 14:37:50 2019
New Revision: 352356
URL: https://svnweb.freebsd.org/changeset/base/352356
Log:
MFC r351399: 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).
Modified:
stable/12/tests/sys/fs/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/tests/sys/fs/Makefile
==============================================================================
--- stable/12/tests/sys/fs/Makefile Sun Sep 15 14:26:19 2019 (r352355)
+++ stable/12/tests/sys/fs/Makefile Sun Sep 15 14:37:50 2019 (r352356)
@@ -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
More information about the svn-src-all
mailing list