d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrate cddl/usr.sbin/zfds/tests into the FreeBSD test suite

Browse Source 
This change integrates the unit tests for zfsd into the test suite using the
integration method described in r345203.

This change removes the `LOCALBASE` includes added for the port version of
googlemock/googletest, as well as unnecessary `LIBADD`/`DPADD` and `CXXFLAGS`
defines, which are included in the `GTEST_CXXFLAGS` variable, as part of
r345203.

Reviewed by:	asomers
Approved by:	emaste (mentor)
MFC after:	2 months
MFC with:	r345203
Differential Revision: https://reviews.freebsd.org/D19552
This commit is contained in:
Enji Cooper 2019-03-15 21:49:19 +00:00
parent 7840b63a78
commit a530b61063
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=345205
3 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cddl/usr.sbin/zfsd/Makefile
View File

@ -1,12 +1,13 @@
# $FreeBSD$
.include <src.opts.mk>
.include "Makefile.common"
PROG_CXX= zfsd
MAN= zfsd.8
.include <bsd.prog.mk>
HAS_TESTS=
SUBDIR.${MK_GOOGLETEST}+= tests
# The unittests require devel/googletest and devel/googlemock from ports.
# Don't automatically build them.
SUBDIR=
.include <bsd.prog.mk>

5
cddl/usr.sbin/zfsd/Makefile.common
View File

@ -28,12 +28,11 @@ INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
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" \) \

28
cddl/usr.sbin/zfsd/tests/Makefile
View File

@ -3,30 +3,12 @@
.include "${.CURDIR}/../Makefile.common"
.PATH: ${.CURDIR:H}
PLAIN_TESTS_CXX= zfsd_unittest
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
SRCS=
GTESTS= zfsd_unittest
# Use #include <zfsd/xxx.h> in test programs.
INCFLAGS+= -I${.CURDIR:H:H}
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
.undef SRCS
.if defined(DESTDIR) || defined(SYSROOT)
INCFLAGS+= -I${SYSROOT:U${DESTDIR}}/usr/include
LDFLAGS.zfsd_unittest+= -L${SYSROOT:U${DESTDIR}}/lib \
-L${SYSROOT:U${DESTDIR}}/usr/lib
.endif
# Googletest options
INCFLAGS+= -I${LOCALBASE}/include -D_THREAD_SAFE -pthread
LDFLAGS.zfsd_unittest+= -L${LOCALBASE}/lib -D_THREAD_SAFE -pthread
LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgtest.a
# GoogleMock options
LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a
# Googlemock fails if we don't have this line
# https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J
CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD
LIBADD.zfsd_unittest+= gmock_main
.include <bsd.test.mk>