Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Aug 2019 19:10:32 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r351399 - head/tests/sys/fs
Message-ID:  <201908221910.x7MJAWZe046406@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Thu Aug 22 19:10:31 2019
New Revision: 351399
URL: https://svnweb.freebsd.org/changeset/base/351399

Log:
  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

Modified:
  head/tests/sys/fs/Makefile

Modified: head/tests/sys/fs/Makefile
==============================================================================
--- head/tests/sys/fs/Makefile	Thu Aug 22 18:57:24 2019	(r351398)
+++ head/tests/sys/fs/Makefile	Thu Aug 22 19:10:31 2019	(r351399)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908221910.x7MJAWZe046406>