From b9b324eac516693026e712ed0319e678b9599f29 Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 25 Apr 2014 19:25:00 +0000 Subject: Remove NO_CTF, exccept as an undocumented compatibility option. Convert all other uses to MK_CTF=no. Set MK_CTF=no rather than the indirect WITHOUT_CDDL in filemon regression. It is expected that NO_CTF will be removed in FreeBSD 12 entirely. --- tools/regression/filemon/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/regression/filemon/Makefile b/tools/regression/filemon/Makefile index 027f131..6ee88f4 100644 --- a/tools/regression/filemon/Makefile +++ b/tools/regression/filemon/Makefile @@ -22,9 +22,8 @@ MAN= WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../sys -# Should be "WITHOUT_CTF=" below, but stupid infastrurture fails: -# "/usr/share/mk/bsd.own.mk", line 489: WITH_CTF and WITHOUT_CTF can't both be set. -WITHOUT_CDDL= +# We don't want to genreate CTF files. Force that here. +MK_CTF=no CLEANFILES+= ${BINS} @@ -59,7 +58,7 @@ test01: ${BINS:Mfilemontest*} ${BINS:Msizeof_long*} clean-test grep -q -v '\.[0-9][0-9][0-9][0-9][0-9][0-9]$$' || printf "Time stamp format OK\n\n" .endfor @cd ${.CURDIR} ; set +e ; for F in filemon_log.* ; do \ - tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon bye-bye" ; \ + tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon bye-bye" ; \ NL=`wc -l $$F | awk '{print $$1}'` ; \ if [ "$${NL}" != 97 ]; then echo "$$F BAD, contains $${NL} lines" ; exit 1 ; fi ; done -- cgit v1.1