Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Feb 2019 00:40:57 +0000 (UTC)
From:      Enji Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r344327 - projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd
Message-ID:  <201902200040.x1K0ev8e012267@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Wed Feb 20 00:40:57 2019
New Revision: 344327
URL: https://svnweb.freebsd.org/changeset/base/344327

Log:
  Build/install cddl/usr.sbin/zfsd/tests if MK_GOOGLETEST != no

Modified:
  projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile

Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile
==============================================================================
--- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile	Wed Feb 20 00:40:16 2019	(r344326)
+++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile	Wed Feb 20 00:40:57 2019	(r344327)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .include "Makefile.common"
 
 PROG_CXX=	zfsd
 MAN=		zfsd.8
 
-.include <bsd.prog.mk>
+SUBDIR.${MK_GOOGLETEST}+=	tests
 
-# The unittests require devel/googletest and devel/googlemock from ports.
-# Don't automatically build them.
-SUBDIR=
+.include <bsd.prog.mk>



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