Index: stable/12/tests/sys/fs/Makefile
===================================================================
--- stable/12/tests/sys/fs/Makefile	(revision 352355)
+++ stable/12/tests/sys/fs/Makefile	(revision 352356)
@@ -1,28 +1,30 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
 .include <bsd.compiler.mk>
 
 PACKAGE=		tests
 
 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
 
 ${PACKAGE}FILES+=	h_funcs.subr
 ${PACKAGE}FILESDIR=	${TESTSDIR}
 
 CLEANFILES+=		h_funcs.subr
 CLEANFILES+=		h_funcs.subr.tmp
 
 h_funcs.subr: ${TESTSRC}/h_funcs.subr
 	cat ${.ALLSRC} | \
 	    sed -e '/atf_require_prog mount_$${name}/d' >>${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 
 .include <bsd.test.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 352355)
+++ stable/12	(revision 352356)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r351399