Date: Mon, 11 Mar 2019 23:27:50 +0000 (UTC) From: Enji Cooper <ngie@FreeBSD.org> 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 Message-ID: <201903112327.x2BNRo65097680@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.test.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903112327.x2BNRo65097680>