Date: Thu, 20 Jul 2017 01:19:06 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r321281 - stable/10/cddl/usr.sbin/dtrace/tests Message-ID: <201707200119.v6K1J6Nu043390@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Jul 20 01:19:05 2017 New Revision: 321281 URL: https://svnweb.freebsd.org/changeset/base/321281 Log: MFC r290570: 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 Modified: stable/10/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/usr.sbin/dtrace/tests/Makefile.inc1 ============================================================================== --- stable/10/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Thu Jul 20 01:13:09 2017 (r321280) +++ stable/10/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Thu Jul 20 01:19:05 2017 (r321281) @@ -11,9 +11,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" @@ -32,13 +29,14 @@ 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707200119.v6K1J6Nu043390>