From owner-svn-src-stable-11@freebsd.org Sun Sep 18 02:41:52 2016
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 586C6BD61A2;
Sun, 18 Sep 2016 02:41:52 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1528E994;
Sun, 18 Sep 2016 02:41:52 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8I2fpQH085987;
Sun, 18 Sep 2016 02:41:51 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8I2fpgU085984;
Sun, 18 Sep 2016 02:41:51 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201609180241.u8I2fpgU085984@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sun, 18 Sep 2016 02:41:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305909 - in stable/11/cddl/usr.sbin/zfsd: . tests
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
<svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>,
<mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>,
<mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Sep 2016 02:41:52 -0000
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>