Date: Sun, 15 Sep 2019 14:37:51 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352356 - stable/12/tests/sys/fs Message-ID: <201909151437.x8FEbpfB030207@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909151437.x8FEbpfB030207>