Integrate cddl/usr.sbin/zfds/tests into the FreeBSD test suite
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:
parent
7840b63a78
commit
a530b61063
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=345205
@ -1,12 +1,13 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include <src.opts.mk>
|
||||||
|
|
||||||
.include "Makefile.common"
|
.include "Makefile.common"
|
||||||
|
|
||||||
PROG_CXX= zfsd
|
PROG_CXX= zfsd
|
||||||
MAN= zfsd.8
|
MAN= zfsd.8
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
HAS_TESTS=
|
||||||
|
SUBDIR.${MK_GOOGLETEST}+= tests
|
||||||
|
|
||||||
# The unittests require devel/googletest and devel/googlemock from ports.
|
.include <bsd.prog.mk>
|
||||||
# Don't automatically build them.
|
|
||||||
SUBDIR=
|
|
||||||
|
@ -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/common/zfs
|
||||||
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
|
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
|
||||||
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
|
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
|
||||||
|
INCFLAGS+= -I${SRCTOP}/cddl/usr.sbin
|
||||||
|
|
||||||
CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
|
CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
|
||||||
|
|
||||||
DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
|
LIBADD+= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil
|
||||||
${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
|
|
||||||
LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil
|
|
||||||
|
|
||||||
cscope:
|
cscope:
|
||||||
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
|
find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
|
||||||
|
@ -3,30 +3,12 @@
|
|||||||
.include "${.CURDIR}/../Makefile.common"
|
.include "${.CURDIR}/../Makefile.common"
|
||||||
.PATH: ${.CURDIR:H}
|
.PATH: ${.CURDIR:H}
|
||||||
|
|
||||||
PLAIN_TESTS_CXX= zfsd_unittest
|
GTESTS= zfsd_unittest
|
||||||
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
|
|
||||||
SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
|
|
||||||
SRCS=
|
|
||||||
|
|
||||||
# Use #include <zfsd/xxx.h> in test programs.
|
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
|
||||||
INCFLAGS+= -I${.CURDIR:H:H}
|
SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
|
||||||
|
.undef SRCS
|
||||||
|
|
||||||
.if defined(DESTDIR) || defined(SYSROOT)
|
LIBADD.zfsd_unittest+= gmock_main
|
||||||
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
|
|
||||||
|
|
||||||
.include <bsd.test.mk>
|
.include <bsd.test.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user