From owner-svn-src-head@freebsd.org  Mon Aug 29 19:10:59 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 6DA64BC3FEF;
 Mon, 29 Aug 2016 19:10:59 +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 3DC63DD9;
 Mon, 29 Aug 2016 19:10:59 +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 u7TJAw6K066284;
 Mon, 29 Aug 2016 19:10:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7TJAwXn066283;
 Mon, 29 Aug 2016 19:10:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201608291910.u7TJAwXn066283@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: Mon, 29 Aug 2016 19:10:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305020 - head/cddl/usr.sbin/zfsd/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Aug 2016 19:10:59 -0000

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>