svn commit: r290570 - head/cddl/usr.sbin/dtrace/tests

Garrett Cooper ngie at FreeBSD.org
Mon Nov 9 02:29:40 UTC 2015


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


More information about the svn-src-all mailing list