From owner-svn-src-all@freebsd.org  Mon Nov  9 02:29:40 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 27379A29206;
 Mon,  9 Nov 2015 02:29:40 +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 E4F601FAA;
 Mon,  9 Nov 2015 02:29:39 +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 tA92Tck5095308;
 Mon, 9 Nov 2015 02:29:38 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA92TcmX095307;
 Mon, 9 Nov 2015 02:29:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511090229.tA92TcmX095307@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 9 Nov 2015 02:29:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290570 - head/cddl/usr.sbin/dtrace/tests
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2015 02:29:40 -0000

Author: ngie
Date: Mon Nov  9 02:29:38 2015
New Revision: 290570
URL: https://svnweb.freebsd.org/changeset/base/290570

Log:
  Reduce the Makefile snippet complexity a bit
  
  - Set BINDIR to TESTSDIR globally (and subsequently, remove all
    `${FILESGROUP}DIR` setting because BINDIR is set to `TESTSDIR`)
  - Set MAN to "" globally, instead of per-PROG
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/cddl/usr.sbin/dtrace/tests/Makefile.inc1

Modified: head/cddl/usr.sbin/dtrace/tests/Makefile.inc1
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/Makefile.inc1	Mon Nov  9 01:53:54 2015	(r290569)
+++ head/cddl/usr.sbin/dtrace/tests/Makefile.inc1	Mon Nov  9 02:29:38 2015	(r290570)
@@ -10,9 +10,6 @@ ${TESTGROUP}= ${TESTFILES}
 ${TESTGROUP}EXE= ${TESTEXES}
 ${TESTGROUP}EXEMODE= 0555
 
-${TESTGROUP}DIR= ${TESTSDIR}
-${TESTGROUP}EXEDIR= ${TESTSDIR}
-
 TESTWRAPPER=	t_dtrace_contrib
 ATF_TESTS_SH+=	${TESTWRAPPER}
 TEST_METADATA.t_dtrace_contrib+= required_files="/usr/local/bin/ksh"
@@ -30,14 +27,15 @@ CLEANFILES+=	${TESTWRAPPER}.sh
 PROGS=		${CFILES:T:S/.c$/.exe/g}
 .for prog in ${PROGS}
 SRCS.${prog}+= ${prog:S/.exe$/.c/}
-BINDIR.${prog}= ${TESTSDIR}
-MAN.${prog}=
 
 .if exists(${prog:S/^tst.//:S/.exe$/.d/})
 SRCS.${prog}+=	${prog:S/^tst.//:S/.exe$/.d/}
 .endif
 .endfor
 
+BINDIR=		${TESTSDIR}
+MAN=
+
 # Some tests depend on the internals of their corresponding test programs,
 # so make sure the optimizer doesn't interfere with them.
 CFLAGS+=	-O0