From owner-svn-src-projects@freebsd.org Mon Mar 11 23:27:51 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 551611532269 for ; Mon, 11 Mar 2019 23:27:51 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E788E89640; Mon, 11 Mar 2019 23:27:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE9E219DB2; Mon, 11 Mar 2019 23:27:50 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2BNRo8C097681; Mon, 11 Mar 2019 23:27:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2BNRo65097680; Mon, 11 Mar 2019 23:27:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903112327.x2BNRo65097680@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Mon, 11 Mar 2019 23:27:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345042 - in projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd: . tests X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd: . tests X-SVN-Commit-Revision: 345042 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E788E89640 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2019 23:27:51 -0000 Author: ngie Date: Mon Mar 11 23:27:50 2019 New Revision: 345042 URL: https://svnweb.freebsd.org/changeset/base/345042 Log: Fix integration with zfsd_unittest The previous code didn't nul out SRCS after setting the pre-bsd.progs.mk value, however, when recursing down into bsd.prog.mk, it was appending the per-prog value to the value of SRCS. The other catch is that code did not install the zfsd headers, so some of the headers, e.g., callout.h could not be found. So, add `-I${SRCTOP}/cddl/usr.sbin` to CXXFLAGS. While here, fix a typo: `LIBDADD.zfsd_unittest` should have been `LIBADD.zfsd_unittest`, and remove the superfluous `DPADD` part which was never required post-LIBADD integration. Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile.common projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile.common ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile.common Mon Mar 11 23:18:09 2019 (r345041) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/Makefile.common Mon Mar 11 23:27:50 2019 (r345042) @@ -28,12 +28,11 @@ INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/li INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +INCFLAGS+= -I${SRCTOP}/cddl/usr.sbin CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} -DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \ - ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL} -LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil +LIBADD+= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil cscope: find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \ Modified: projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Mon Mar 11 23:18:09 2019 (r345041) +++ projects/import-googletest-1.8.1/cddl/usr.sbin/zfsd/tests/Makefile Mon Mar 11 23:27:50 2019 (r345042) @@ -7,7 +7,8 @@ GTESTS= zfsd_unittest SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc +.undef SRCS -LIBDADD.zfsd_unittest+= gmock_main +LIBADD.zfsd_unittest+= gmock_main .include