Remove redundant declarations and simplify ../ in pathing
- TESTSBASE and LOCALBASE are already defined in bsd.tests.mk - TESTSDIR is automatically divined as ${TESTSBASE}${RELDIR:H} after r289158. - Replace SRCDIR with SRCTOP MFC after: 1 week X-MFC with: r305019 Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
01c7535846
commit
62f5085bc4
@ -1,10 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
SRCDIR=${.CURDIR}/../../../..
|
||||
.include "${.CURDIR}/../Makefile.common"
|
||||
.PATH: ${.CURDIR}/..
|
||||
|
||||
TESTSDIR?= ${TESTSBASE}/cddl/usr.sbin/zfsd
|
||||
.PATH: ${.CURDIR:H}
|
||||
|
||||
PLAIN_TESTS_CXX= zfsd_unittest
|
||||
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
|
||||
@ -12,7 +9,7 @@ SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
|
||||
SRCS=
|
||||
|
||||
# Use #include <zfsd/xxx.h> in test programs.
|
||||
INCFLAGS+= -I${.CURDIR}/../..
|
||||
INCFLAGS+= -I${.CURDIR:H:H}
|
||||
|
||||
.if defined(DESTDIR)
|
||||
INCFLAGS+= -I${DESTDIR}/usr/include
|
||||
@ -27,7 +24,6 @@ LIBRARY_PATH=
|
||||
.endif
|
||||
|
||||
# Googletest options
|
||||
LOCALBASE?= /usr/local
|
||||
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
|
||||
@ -39,7 +35,4 @@ LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main
|
||||
# https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J
|
||||
CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD
|
||||
|
||||
# Install the tests
|
||||
TESTSBASE?= /usr/tests
|
||||
|
||||
.include <bsd.test.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user