From owner-svn-src-user@freebsd.org  Wed May  4 02:16:14 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 89597B2C97B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Wed,  4 May 2016 02:16:14 +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 3D09313A1;
 Wed,  4 May 2016 02:16:14 +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 u442GDOC081816;
 Wed, 4 May 2016 02:16:13 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u442GDkd081814;
 Wed, 4 May 2016 02:16:13 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605040216.u442GDkd081814@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: Wed, 4 May 2016 02:16:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r299037 - in
 user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests: . tools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 May 2016 02:16:14 -0000

Author: ngie
Date: Wed May  4 02:16:13 2016
New Revision: 299037
URL: https://svnweb.freebsd.org/changeset/base/299037

Log:
  Use ${PACKAGE}FILES instead of TESTFILES
  
  For some odd reason make was getting "lost" with the former idiom and wasn't
  installing .d and .ksh scripts..

Modified:
  user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
  user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

Modified: user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
==============================================================================
--- user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk	Wed May  4 02:11:45 2016	(r299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/dtrace.test.mk	Wed May  4 02:16:13 2016	(r299037)
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
-TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
+TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
 TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP}
 
-FILESGROUPS+=	FILES ${TESTGROUP} ${TESTGROUP}EXE
+FILESGROUPS+=	${TESTGROUP}EXE
 
-${TESTGROUP}= ${TESTFILES}
 ${TESTGROUP}EXE= ${TESTEXES}
 ${TESTGROUP}EXEMODE= 0555
 
@@ -17,8 +16,8 @@ TEST_METADATA.t_dtrace_contrib+= require
 
 GENTEST?=	${.CURDIR:H:H}/tools/gentest.sh
 EXCLUDE=	${.CURDIR:H:H}/tools/exclude.sh
-${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}}
-	sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
+	sh ${GENTEST} -e ${EXCLUDE} ${${PACKAGE}FILES} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
 
 CLEANFILES+=	${TESTWRAPPER}.sh
 

Modified: user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed May  4 02:11:45 2016	(r299036)
+++ user/ngie/release-pkg-fix-tests/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh	Wed May  4 02:16:13 2016	(r299037)
@@ -52,7 +52,9 @@ WITH_CTF=YES
 # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
 #
 
-TESTFILES= \\
+PACKAGE=	tests
+
+\${PACKAGE}FILES= \\
 $tfiles
 
 TESTEXES= \\