svn commit: r305020 - head/cddl/usr.sbin/zfsd/tests

[Ngie Cooper]

Author: ngie
Date: Mon Aug 29 19:10:58 2016
New Revision: 305020
URL: https://svnweb.freebsd.org/changeset/base/305020

Log:
  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

Modified:
  head/cddl/usr.sbin/zfsd/tests/Makefile

Modified: head/cddl/usr.sbin/zfsd/tests/Makefile
==============================================================================
--- head/cddl/usr.sbin/zfsd/tests/Makefile	Mon Aug 29 19:07:48 2016	(r305019)
+++ head/cddl/usr.sbin/zfsd/tests/Makefile	Mon Aug 29 19:10:58 2016	(r305020)
@@ -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_un
 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/l
 # 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>