svn commit: r305909 - in stable/11/cddl/usr.sbin/zfsd: . tests

[Ngie Cooper]

Author: ngie
Date: Sun Sep 18 02:41:50 2016
New Revision: 305909
URL: https://svnweb.freebsd.org/changeset/base/305909

Log:
  MFC r305018,r305019,r305020:
  
  r305018:
  
  Use SRCTOP instead of a homegrown definition for it (SRCDIR)
  
  r305019:
  
  Remove unnecessary variable (SRCDIR) replaced by SRCTOP in Makefile.common
  
  r305020:
  
  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

Modified:
  stable/11/cddl/usr.sbin/zfsd/Makefile
  stable/11/cddl/usr.sbin/zfsd/Makefile.common
  stable/11/cddl/usr.sbin/zfsd/tests/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/usr.sbin/zfsd/Makefile
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/Makefile	Sat Sep 17 23:08:49 2016	(r305908)
+++ stable/11/cddl/usr.sbin/zfsd/Makefile	Sun Sep 18 02:41:50 2016	(r305909)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-SRCDIR=${.CURDIR}/../../..
 .include "Makefile.common"
 
 PROG_CXX=	zfsd

Modified: stable/11/cddl/usr.sbin/zfsd/Makefile.common
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/Makefile.common	Sat Sep 17 23:08:49 2016	(r305908)
+++ stable/11/cddl/usr.sbin/zfsd/Makefile.common	Sun Sep 18 02:41:50 2016	(r305909)
@@ -15,20 +15,20 @@ WARNS?=		3
 # Ignore warnings about Solaris specific pragmas.
 IGNORE_PRAGMA=  YES
 
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
-INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
-INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
-INCFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libumem/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
-INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+INCFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
+INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
+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}/sys/cddl/contrib/opensolaris/uts/common/sys
 
 CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
 

Modified: stable/11/cddl/usr.sbin/zfsd/tests/Makefile
==============================================================================
--- stable/11/cddl/usr.sbin/zfsd/tests/Makefile	Sat Sep 17 23:08:49 2016	(r305908)
+++ stable/11/cddl/usr.sbin/zfsd/tests/Makefile	Sun Sep 18 02:41:50 2016	(r305909)
@@ -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>