diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2015-11-09 02:29:38 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2015-11-09 02:29:38 +0000 |
commit | 7c49f4218a8d9eff2a254762864f12eb931d0e74 (patch) | |
tree | 2059057de603fe03f09bcb53393d0861c3e4084d | |
parent | f51f84a628e60ded1d25ac3d7770666cea2a214f (diff) | |
download | src-7c49f4218a8d9eff2a254762864f12eb931d0e74.tar.gz src-7c49f4218a8d9eff2a254762864f12eb931d0e74.zip |
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
Notes
Notes:
svn path=/head/; revision=290570
-rw-r--r-- | cddl/usr.sbin/dtrace/tests/Makefile.inc1 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile.inc1 b/cddl/usr.sbin/dtrace/tests/Makefile.inc1 index 6e7cc079c14d..0c528eff5896 100644 --- a/cddl/usr.sbin/dtrace/tests/Makefile.inc1 +++ b/cddl/usr.sbin/dtrace/tests/Makefile.inc1 @@ -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 |