diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-08-29 19:10:58 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-08-29 19:10:58 +0000 |
| commit | 47d6e5cb8697fad06e44f07c74524cdd68c038ef (patch) | |
| tree | 8d2270572302517be83b57114e4fc5db9b854918 /cddl | |
| parent | 68aee22c0e037f3f67f28f1bf50ff09a86e3ca66 (diff) | |
| download | src-test2-47d6e5cb8697fad06e44f07c74524cdd68c038ef.tar.gz src-test2-47d6e5cb8697fad06e44f07c74524cdd68c038ef.zip | |
Notes
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/usr.sbin/zfsd/tests/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cddl/usr.sbin/zfsd/tests/Makefile b/cddl/usr.sbin/zfsd/tests/Makefile index 8eab50554633..66fc81468ea5 100644 --- a/cddl/usr.sbin/zfsd/tests/Makefile +++ b/cddl/usr.sbin/zfsd/tests/Makefile @@ -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> |