diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc index 94a42492a4f0..687068d599e8 100644 --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -1,15 +1,13 @@ # $FreeBSD$ OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN -WARNS?= 6 - # Do not lint the CDDL stuff. It is all externally maintained and # lint output is wasteful noise here. NO_LINT= diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index bcca9b353303..71496f774830 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ DIALOG= ${SRCTOP}/contrib/dialog PROG= dialog LIBADD= dialog ncursesw m CFLAGS+= -I${.CURDIR} -I${DIALOG} .PATH: ${DIALOG} -WARNS?= 6 - .include diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc index 319ce6ec7ec6..36f7228c079b 100644 --- a/lib/googletest/Makefile.inc +++ b/lib/googletest/Makefile.inc @@ -1,14 +1,12 @@ # $FreeBSD$ .include GTEST_DIR= ${SRCTOP}/contrib/googletest GOOGLEMOCK_SRCROOT= ${GTEST_DIR}/googlemock GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest CXXFLAGS+= ${GTESTS_FLAGS} # Silence warnings about usage of deprecated std::auto_ptr CXXWARNFLAGS+= -Wno-deprecated-declarations - -WARNS?= 6 diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile index 178c30805f92..89e59ca9932e 100644 --- a/lib/libcam/tests/Makefile +++ b/lib/libcam/tests/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ ATF_TESTS_C+= libcam_test ATF_TESTS_C+= cam_test LIBADD+= cam -WARNS?= 6 - .include diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile index 22b7fccccbba..15798b215d17 100644 --- a/lib/libcrypt/tests/Makefile +++ b/lib/libcrypt/tests/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ ATF_TESTS_C+= crypt_tests NETBSD_ATF_TESTS_C+= crypt_test -WARNS?= 6 CFLAGS+= -I${.CURDIR:H} LIBADD= crypt .include .include diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index d42473637534..556997404f99 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -1,17 +1,16 @@ # $FreeBSD$ .PATH: ${SRCTOP}/lib/libc/iconv SHLIB_MAJOR= 4 -WARNS?= 6 CFLAGS+= -I${SRCTOP}/lib/libc/iconv CFLAGS+= -Dbool=_Bool .if !defined(COMPAT_32BIT) SHLIBDIR= /usr/lib/i18n .else SHLIBDIR= /usr/lib32/i18n .endif LIBDIR= ${SHLIBDIR} MK_PROFILE= no diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index d934690d4355..6afb8c4ad2e1 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -1,45 +1,43 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ PACKAGE=lib${LIB} LIB= kvm SHLIBDIR?= /lib SHLIB_MAJOR= 7 CFLAGS+=-DNO__SCCSID -I${.CURDIR} -WARNS?= 6 - SRCS= kvm.c kvm_cptime.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_pcpu.c kvm_private.c kvm_proc.c kvm_vnet.c \ kvm_minidump_aarch64.c \ kvm_amd64.c kvm_minidump_amd64.c \ kvm_arm.c kvm_minidump_arm.c \ kvm_i386.c kvm_minidump_i386.c \ kvm_minidump_mips.c \ kvm_powerpc.c kvm_powerpc64.c \ kvm_minidump_riscv.c \ kvm_sparc64.c INCS= kvm.h LIBADD= elf MAN= kvm.3 kvm_getcptime.3 kvm_geterr.3 kvm_getloadavg.3 \ kvm_getpcpu.3 kvm_getprocs.3 kvm_getswapinfo.3 kvm_native.3 \ kvm_nlist.3 kvm_open.3 kvm_read.3 MLINKS+=kvm_getpcpu.3 kvm_getmaxcpu.3 \ kvm_getpcpu.3 kvm_dpcpu_setcpu.3 \ kvm_getpcpu.3 kvm_read_zpcpu.3 \ kvm_getpcpu.3 kvm_counter_u64_fetch.3 MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3 MLINKS+=kvm_nlist.3 kvm_nlist2.3 MLINKS+=kvm_open.3 kvm_close.3 kvm_open.3 kvm_open2.3 kvm_open.3 kvm_openfiles.3 MLINKS+=kvm_read.3 kvm_read2.3 kvm_read.3 kvm_write.3 .include HAS_TESTS= SUBDIR.${MK_TESTS}= tests .include diff --git a/lib/libkvm/tests/Makefile b/lib/libkvm/tests/Makefile index 24caf9108883..1f74aec83f02 100644 --- a/lib/libkvm/tests/Makefile +++ b/lib/libkvm/tests/Makefile @@ -1,24 +1,22 @@ # $FreeBSD$ .include ATF_TESTS_C+= kvm_close_test ATF_TESTS_C+= kvm_geterr_test ATF_TESTS_C+= kvm_open_test ATF_TESTS_C+= kvm_open2_test ATF_TESTS_C+= kvm_read_test CFLAGS.kvm_geterr_test+= -I${.CURDIR:H} CFLAGS.kvm_read_test+= -I${.CURDIR:H} LIBADD+= kvm -WARNS?= 6 - BINDIR= ${TESTSDIR} .for t in kvm_geterr_test kvm_open_test kvm_open2_test kvm_read_test SRCS.$t= $t.c kvm_test_common.c .endfor .include diff --git a/lib/libpathconv/tests/Makefile b/lib/libpathconv/tests/Makefile index f32db22c1db8..c7696c2d6c5d 100644 --- a/lib/libpathconv/tests/Makefile +++ b/lib/libpathconv/tests/Makefile @@ -1,11 +1,10 @@ # $FreeBSD$ TAP_TESTS_C+= abs2rel TAP_TESTS_C+= rel2abs -WARNS?= 6 #LIBADD+= pathconv #LDADD+= -L .. -lpathconv LDADD+= ../libpathconv.a .include diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile index 8c7563a33ca6..93f50789c88c 100644 --- a/lib/libproc/tests/Makefile +++ b/lib/libproc/tests/Makefile @@ -1,17 +1,16 @@ # $FreeBSD$ ATF_TESTS_C+= proc_test PROGS= target_prog SRCS_target_prog= target_prog.c BINDIR_target_prog= ${TESTSDIR} -WARNS?= 6 LIBADD= elf proc rtld_db util # Ensure that symbols aren't stripped from the test program, as they're needed # for testing symbol lookup. STRIP= CFLAGS.target_prog.c+= -O0 .include diff --git a/lib/libsbuf/tests/Makefile b/lib/libsbuf/tests/Makefile index d3532f01b7b6..b563ebfe1728 100644 --- a/lib/libsbuf/tests/Makefile +++ b/lib/libsbuf/tests/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ ATF_TESTS_C+= sbuf_core_test ATF_TESTS_C+= sbuf_stdio_test ATF_TESTS_C+= sbuf_string_test LIBADD+= sbuf util -WARNS?= 6 - .include diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc index 7b6a65fc7172..5a94bbf52a4b 100644 --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,7 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD$ BINDIR?= /usr/libexec -WARNS?= 6 WFORMAT?= 1 diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile index ff4b91157511..a65d1d7da981 100644 --- a/libexec/getty/Makefile +++ b/libexec/getty/Makefile @@ -1,14 +1,13 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ CONFS= gettytab PROG= getty SRCS= main.c init.c subr.c chat.c LIBADD= util MAN= gettytab.5 ttys.5 getty.8 -WARNS?= 6 WFORMAT=0 .include diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index a51acf68068a..48fd4f6f01c0 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -1,118 +1,117 @@ # $FreeBSD$ # Use the following command to build local debug version of dynamic # linker: # make DEBUG_FLAGS=-g WITHOUT_TESTS=yes all .include PACKAGE= clibs MK_PIE= no # Always position independent using local rules MK_SSP= no CONFS= libmap.conf PROG?= ld-elf.so.1 .if (${PROG:M*ld-elf32*} != "") TAGS+= lib32 .endif SRCS= \ rtld_start.S \ reloc.c \ rtld.c \ rtld_lock.c \ rtld_malloc.c \ rtld_printf.c \ map_object.c \ xmalloc.c \ debug.c \ libmap.c MAN= rtld.1 CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -ffreestanding CFLAGS+= -I${SRCTOP}/lib/csu/common .if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} .else RTLD_ARCH= ${MACHINE_CPUARCH} .endif CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR} .if ${MACHINE_ARCH} == "powerpc64" LDFLAGS+= -nostdlib -e _rtld_start .else LDFLAGS+= -nostdlib -e .rtld_start .endif NO_WCAST_ALIGN= yes -WARNS?= 6 INSTALLFLAGS= -C -b PRECIOUSPROG= BINDIR= /libexec SYMLINKS= ../..${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 .if ${MACHINE_CPUARCH} == "sparc64" CFLAGS+= -fPIC .else CFLAGS+= -fpic .endif CFLAGS+= -DPIC $(DEBUG) .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -fvisibility=hidden .endif .if ${MACHINE_CPUARCH} == "mips" CFLAGS.reloc.c+=-fno-jump-tables .endif LDFLAGS+= -shared -Wl,-Bsymbolic -Wl,-z,defs LIBADD= c_nossp_pic .if ${MK_TOOLCHAIN} == "no" LDFLAGS+= -L${LIBCDIR} .endif .if ${MACHINE_CPUARCH} == "arm" # Some of the required math functions (div & mod) are implemented in # libcompiler_rt on ARM. The library also needs to be placed first to be # correctly linked. As some of the functions are used before we have # shared libraries. LIBADD+= compiler_rt .endif .if ${MK_SYMVER} == "yes" VERSION_DEF= ${LIBCSRCDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} .if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map) SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map .endif .endif .sinclude "${.CURDIR}/${RTLD_ARCH}/Makefile.inc" # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: .if exists(${DESTDIR}/usr/libexec/${PROG}) && ${MK_STAGING} == "no" -chflags -h noschg ${DESTDIR}/usr/libexec/${PROG} .endif .PATH: ${.CURDIR}/${RTLD_ARCH} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include ${PROG_FULL}: ${VERSION_MAP} .include .if ${COMPILER_TYPE} == "gcc" # GCC warns about redeclarations even though they have __exported # and are therefore not identical to the ones from the system headers. CFLAGS+= -Wno-redundant-decls .if ${COMPILER_VERSION} < 40300 # Silence -Wshadow false positives in ancient GCC CFLAGS+= -Wno-shadow .endif .endif diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile index 7c9583960953..9ad4b883015c 100644 --- a/libexec/rtld-elf/tests/libpythagoras/Makefile +++ b/libexec/rtld-elf/tests/libpythagoras/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ .include LIB= pythagoras SHLIB_MAJOR= 0 LIBDIR= ${TESTSBASE}/libexec/rtld-elf SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf SRCS= pythagoras.c -WARNS?= 6 LIBADD= m .include diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile index 9aa420cec1a5..fb5212e2ad6f 100644 --- a/libexec/tftpd/tests/Makefile +++ b/libexec/tftpd/tests/Makefile @@ -1,15 +1,14 @@ # $FreeBSD$ .include # Skip on GCC 4.2, because it lacks __COUNTER__ .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40300 ATF_TESTS_C= functional TEST_METADATA.functional+= timeout=15 .endif LIBADD= util -WARNS?= 6 CSTD= c11 .include diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile index 423bca9c454e..3a3a6a029f87 100644 --- a/sbin/decryptcore/Makefile +++ b/sbin/decryptcore/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PROG= decryptcore LIBADD= crypto pjdlog MAN= decryptcore.8 CFLAGS+=-I${SRCTOP}/lib/libpjdlog -WARNS?= 6 - .include diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile index 678641562d93..2d5082ac839b 100644 --- a/sbin/ping/tests/Makefile +++ b/sbin/ping/tests/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ -WARNS?= 6 - ATF_TESTS_C+= in_cksum_test SRCS.in_cksum_test= in_cksum_test.c ../utils.c PACKAGE= tests ATF_TESTS_SH+= ping_test ${PACKAGE}FILES+= ping_c1_s56_t1.out .include diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile index 41ef1f3e4912..2094ad29d54b 100644 --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ PACKAGE=runtime PROG= recoverdisk +LDFLAGS += -lm + .include test: ${PROG} ./${PROG} /dev/ad0 diff --git a/sys/teken/demo/Makefile b/sys/teken/demo/Makefile index 1ade690afe22..e39c5742bc96 100644 --- a/sys/teken/demo/Makefile +++ b/sys/teken/demo/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PROG= teken_demo LDADD= -lncursesw -lteken -lutil MAN= -WARNS?= 6 - .include diff --git a/sys/teken/libteken/Makefile b/sys/teken/libteken/Makefile index d1c9d3c9da70..20ec0aff0faa 100644 --- a/sys/teken/libteken/Makefile +++ b/sys/teken/libteken/Makefile @@ -1,39 +1,38 @@ # $FreeBSD$ LIB= teken SHLIB_MAJOR= 0 CFLAGS+=-I. -WARNS?= 6 SRCDIR= ${.CURDIR}/.. .PATH: ${SRCDIR} SRCS= teken.c teken_state.h INCS= teken.h CLEANFILES=teken_state.h MAN= teken.3 MLINKS= teken.3 teken_256to8.3 \ teken.3 teken_get_curattr.3 \ teken.3 teken_get_cursor.3 \ teken.3 teken_get_defattr.3 \ teken.3 teken_get_defattr_cons25.3 \ teken.3 teken_get_sequence.3 \ teken.3 teken_get_winsize.3 \ teken.3 teken_init.3 \ teken.3 teken_input.3 \ teken.3 teken_set_8bit.3 \ teken.3 teken_set_cons25.3 \ teken.3 teken_set_curattr.3 \ teken.3 teken_set_cursor.3 \ teken.3 teken_set_defattr.3 \ teken.3 teken_set_winsize.3 teken_state.h: ${SRCDIR}/gensequences ${SRCDIR}/sequences awk -f ${SRCDIR}/gensequences ${SRCDIR}/sequences > ${.TARGET} VERSION_DEF= ${.CURDIR}/../../../lib/libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map .include diff --git a/sys/teken/stress/Makefile b/sys/teken/stress/Makefile index 7216da0bd60d..9a0257f02760 100644 --- a/sys/teken/stress/Makefile +++ b/sys/teken/stress/Makefile @@ -1,9 +1,7 @@ # $FreeBSD$ PROG= teken_stress LDADD= -lteken MAN= -WARNS?= 6 - .include diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc index 0b336d3f3ef3..2cba822015ae 100644 --- a/tests/sys/Makefile.inc +++ b/tests/sys/Makefile.inc @@ -1,5 +1,3 @@ # $FreeBSD$ -WARNS?= 6 - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile index ef44036bf3d8..db9da144c43b 100644 --- a/tests/sys/aio/Makefile +++ b/tests/sys/aio/Makefile @@ -1,22 +1,20 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/aio ATF_TESTS_C+= aio_test ATF_TESTS_C+= lio_test TEST_METADATA.aio_test+= timeout="30" TEST_METADATA.lio_test+= timeout="10" # Some lio_test testcases involve system resource limitations, so cannot run concurrently TEST_METADATA.lio_test+= is_exclusive=true PLAIN_TESTS_C+= aio_kqueue_test PLAIN_TESTS_C+= lio_kqueue_test LIBADD.aio_test+= util rt LIBADD.lio_test+= rt CFLAGS+= -I${.CURDIR:H:H} -WARNS?= 6 - .include diff --git a/tests/sys/audit/Makefile b/tests/sys/audit/Makefile index 6f70121da14f..01bdc6754ef7 100644 --- a/tests/sys/audit/Makefile +++ b/tests/sys/audit/Makefile @@ -1,58 +1,56 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/audit ATF_TESTS_C= file-attribute-access ATF_TESTS_C+= file-attribute-modify ATF_TESTS_C+= file-create ATF_TESTS_C+= file-delete ATF_TESTS_C+= file-close ATF_TESTS_C+= file-write ATF_TESTS_C+= file-read ATF_TESTS_C+= open ATF_TESTS_C+= ioctl ATF_TESTS_C+= network ATF_TESTS_C+= inter-process ATF_TESTS_C+= administrative ATF_TESTS_C+= process-control ATF_TESTS_C+= miscellaneous SRCS.file-attribute-access+= file-attribute-access.c SRCS.file-attribute-access+= utils.c SRCS.file-attribute-modify+= file-attribute-modify.c SRCS.file-attribute-modify+= utils.c SRCS.file-create+= file-create.c SRCS.file-create+= utils.c SRCS.file-delete+= file-delete.c SRCS.file-delete+= utils.c SRCS.file-close+= file-close.c SRCS.file-close+= utils.c SRCS.file-write+= file-write.c SRCS.file-write+= utils.c SRCS.file-read+= file-read.c SRCS.file-read+= utils.c SRCS.open+= open.c SRCS.open+= utils.c SRCS.ioctl+= ioctl.c SRCS.ioctl+= utils.c SRCS.network+= network.c SRCS.network+= utils.c SRCS.inter-process+= inter-process.c SRCS.inter-process+= utils.c SRCS.administrative+= administrative.c SRCS.administrative+= utils.c SRCS.process-control+= process-control.c SRCS.process-control+= utils.c SRCS.miscellaneous+= miscellaneous.c SRCS.miscellaneous+= utils.c TEST_METADATA+= timeout="30" TEST_METADATA+= required_user="root" TEST_METADATA+= is_exclusive="true" TEST_METADATA+= required_files="/etc/rc.d/auditd" -WARNS?= 6 - LDFLAGS+= -lbsm -lutil .include diff --git a/tests/sys/auditpipe/Makefile b/tests/sys/auditpipe/Makefile index 9610599a22b6..ac7715d57f5d 100644 --- a/tests/sys/auditpipe/Makefile +++ b/tests/sys/auditpipe/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/auditpipe ATF_TESTS_C= auditpipe_test TEST_METADATA+= required_user="root" -WARNS?= 6 +TEST_METADATA+= required_files="/dev/auditpipe" .include diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile index 6b0e53fa0865..9c69b6ac856b 100644 --- a/tests/sys/capsicum/Makefile +++ b/tests/sys/capsicum/Makefile @@ -1,12 +1,53 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/capsicum ATF_TESTS_C+= bindat_connectat ATF_TESTS_C+= ioctls_test CFLAGS+= -I${SRCTOP}/tests -WARNS?= 6 +.if ${MK_GOOGLETEST} != no + +.PATH: ${SRCTOP}/contrib/capsicum-test + +GTESTS+= capsicum-test + +SRCS.capsicum-test+= \ + capsicum-test-main.cc \ + capsicum-test.cc \ + capability-fd.cc \ + fexecve.cc \ + procdesc.cc \ + capmode.cc \ + fcntl.cc \ + ioctl.cc \ + openat.cc \ + sysctl.cc \ + select.cc \ + mqueue.cc \ + socket.cc \ + sctp.cc \ + capability-fd-pair.cc \ + overhead.cc \ + rename.cc + +LIBADD.capsicum-test+= gtest pthread +TEST_METADATA.capsicum-test= required_user="unprivileged" + +.for p in mini-me mini-me.noexec mini-me.setuid +PROGS+= $p +NO_SHARED.$p= +SRCS.$p= mini-me.c +.endfor + +BINDIR= ${TESTSDIR} + +BINMODE.mini-me.noexec= ${NOBINMODE} +BINMODE.mini-me.setuid= 4555 + +WARNS.capsicum-test= 3 + +.endif .include diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index c3cf1f14e5bf..413998950ee2 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -1,90 +1,88 @@ # $FreeBSD$ .include PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/fs/fusefs # We could simply link all of these files into a single executable. But since # Kyua treats googletest programs as plain tests, it's better to separate them # out, so we get more granular reporting. GTESTS+= access GTESTS+= allow_other GTESTS+= bmap GTESTS+= cache GTESTS+= create GTESTS+= default_permissions GTESTS+= default_permissions_privileged GTESTS+= destroy GTESTS+= dev_fuse_poll GTESTS+= fifo GTESTS+= flush GTESTS+= forget GTESTS+= fsync GTESTS+= fsyncdir GTESTS+= getattr GTESTS+= interrupt GTESTS+= io GTESTS+= link GTESTS+= locks GTESTS+= lookup GTESTS+= mkdir GTESTS+= mknod GTESTS+= mount GTESTS+= nfs GTESTS+= notify GTESTS+= open GTESTS+= opendir GTESTS+= read GTESTS+= readdir GTESTS+= readlink GTESTS+= release GTESTS+= releasedir GTESTS+= rename GTESTS+= rmdir GTESTS+= setattr GTESTS+= statfs GTESTS+= symlink GTESTS+= unlink GTESTS+= write GTESTS+= xattr .for p in ${GTESTS} SRCS.$p+= ${p}.cc SRCS.$p+= getmntopts.c SRCS.$p+= mockfs.cc SRCS.$p+= utils.cc .endfor TEST_METADATA.default_permissions+= required_user="unprivileged" TEST_METADATA.default_permissions_privileged+= required_user="root" TEST_METADATA.mknod+= required_user="root" TEST_METADATA.nfs+= required_user="root" # TODO: drastically increase timeout after test development is mostly complete TEST_METADATA+= timeout=10 FUSEFS= ${SRCTOP}/sys/fs/fuse MOUNT= ${SRCTOP}/sbin/mount # Suppress warnings that GCC generates for the libc++ and gtest headers. CXXWARNFLAGS.gcc+= -Wno-placement-new -Wno-attributes # Suppress Wcast-align for readdir.cc, because it is unavoidable when using # getdirentries. CXXWARNFLAGS.readdir.cc+= -Wno-cast-align .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 80000 CXXWARNFLAGS+= -Wno-class-memaccess .endif CXXFLAGS+= -I${SRCTOP}/tests CXXFLAGS+= -I${FUSEFS} CXXFLAGS+= -I${MOUNT} .PATH: ${MOUNT} CXXSTD= c++14 LIBADD+= pthread LIBADD+= gmock gtest LIBADD+= util -WARNS?= 6 - .include diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile index 193676465aa3..9211700ada98 100644 --- a/tests/sys/kern/pipe/Makefile +++ b/tests/sys/kern/pipe/Makefile @@ -1,17 +1,15 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/kern/pipe PLAIN_TESTS_C+= big_pipe_test PLAIN_TESTS_C+= pipe_fstat_bug_test PLAIN_TESTS_C+= pipe_ino_test ATF_TESTS_C+= pipe_kqueue_test PLAIN_TESTS_C+= pipe_overcommit1_test PLAIN_TESTS_C+= pipe_overcommit2_test PLAIN_TESTS_C+= pipe_reverse2_test PLAIN_TESTS_C+= pipe_reverse_test PLAIN_TESTS_C+= pipe_wraparound_test -WARNS?= 6 - .include diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile index 251c497e32e4..861694e0b353 100644 --- a/tests/sys/mqueue/Makefile +++ b/tests/sys/mqueue/Makefile @@ -1,21 +1,19 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 PROGS+= mqtest3 PROGS+= mqtest4 PROGS+= mqtest5 LIBADD+= rt -WARNS?= 6 - .include diff --git a/tests/sys/net/Makefile b/tests/sys/net/Makefile index cccabd9fc775..b14d6cbf8253 100644 --- a/tests/sys/net/Makefile +++ b/tests/sys/net/Makefile @@ -1,33 +1,33 @@ # $FreeBSD$ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/net BINDIR= ${TESTSDIR} ATF_TESTS_C+= if_epair ATF_TESTS_SH+= if_bridge_test ATF_TESTS_SH+= if_clone_test ATF_TESTS_SH+= if_lagg_test ATF_TESTS_SH+= if_tun_test ATF_TESTS_SH+= if_vlan # The tests are written to be run in parallel, but doing so leads to random # panics. I think it's because the kernel's list of interfaces isn't properly # locked. TEST_METADATA+= is_exclusive=true ${PACKAGE}FILES+= \ dhclient_pcp.conf \ pcp.py \ stp.py ${PACKAGE}FILESMODE_pcp.py= 0555 ${PACKAGE}FILESMODE_stp.py= 0555 MAN= PROGS+= randsleep -WARNS?= 6 +CFLAGS+= -I${.CURDIR:H:H} .include diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index f5b465557282..3bb99af8b88b 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -1,19 +1,17 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/netinet BINDIR= ${TESTSDIR} TESTS_SUBDIRS+= libalias ATF_TESTS_C= ip_reass_test \ so_reuseport_lb_test ATF_TESTS_SH= fibs_test arp PROGS= udp_dontroute tcp_user_cookie MAN= -WARNS?= 6 - .include diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile index a1d61ddf8952..0228271dd668 100644 --- a/tests/sys/netmap/Makefile +++ b/tests/sys/netmap/Makefile @@ -1,16 +1,14 @@ # $FreeBSD$ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netmap TEST_METADATA+= required_user="root" TEST_METADATA+= is_exclusive=true PLAIN_TESTS_C+= ctrl-api-test CFLAGS+= -I${SRCTOP}/tests LIBADD+= pthread -WARNS?= 6 - .include diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile index f9685b166afc..a0094091ecc6 100644 --- a/tests/sys/opencrypto/Makefile +++ b/tests/sys/opencrypto/Makefile @@ -1,26 +1,24 @@ # $FreeBSD$ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/opencrypto BINDIR= ${TESTSDIR} CFLAGS+= -I${SRCTOP}/tests CFLAGS.blake2_test.c += -I${SRCTOP}/sys/opencrypto CFLAGS.blake2_test.c += -I${SRCTOP}/sys/contrib/libb2 CFLAGS.poly1305_test.c += -I${SRCTOP}/sys/opencrypto ATF_TESTS_C+= blake2_test poly1305_test TAP_TESTS_SH+= runtests TEST_METADATA.runtests+= required_programs="python3" TEST_METADATA.runtests+= required_user="root" PYMODULES= cryptodev.py cryptodevh.py cryptotest.py ${PACKAGE}FILES+= ${PYMODULES} -WARNS?= 6 - .include diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile index e676cc036bad..53e29c3891fb 100644 --- a/tests/sys/pjdfstest/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/pjdfstest/Makefile @@ -1,15 +1,13 @@ # $FreeBSD$ PACKAGE= tests .PATH: ${SRCTOP}/contrib/pjdfstest BINDIR= ${TESTSBASE}/sys/pjdfstest PROG= pjdfstest MAN= CFLAGS+= -I${.CURDIR:H} -WARNS?= 6 - .include diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile index 38d9db62266a..aac9a3b89e45 100644 --- a/tools/regression/aio/aiop/Makefile +++ b/tools/regression/aio/aiop/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= aiop MAN= -WARNS= 6 - .include diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile index d0038f915239..e01a54e26cb3 100644 --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -1,79 +1,78 @@ # $FreeBSD$ TEST_CASES?= test0001 test0002 test0003 test0004 \ test0005 test0006 test0007 test0008 \ test0009 test0010 test0011 test0012 \ test0013 test0014 test0015 test0016 \ test0017 test0018 test0019 test0020 \ test0021 test0022 test0023 test0024 \ test0025 test0026 test0027 test0028 \ test0029 test0030 test0031 test0032 \ test0033 test0034 test0035 test0036 \ test0037 test0038 test0039 test0040 \ test0041 test0042 test0043 test0044 \ test0045 test0046 test0047 test0048 \ test0049 test0050 test0051 test0052 \ test0053 test0054 test0055 test0056 \ test0057 test0058 test0059 test0060 \ test0061 test0062 test0063 test0064 \ test0065 test0066 test0067 test0068 \ test0069 test0070 test0071 test0072 \ test0073 test0074 test0075 test0076 \ test0077 test0078 test0079 test0080 \ test0081 test0082 test0083 test0084 \ test0085 test0086 test0087 test0088 \ test0089 test0090 test0091 SYSDIR?= ${SRCTOP}/sys SRCS= ${.CURDIR}/bpf_test.c CFLAGS+= -g -I${SYSDIR} -I${.CURDIR}/tests .if defined(BPF_BENCHMARK) CFLAGS+= -DBPF_BENCHMARK -DLOG_LEVEL=0 .elif defined(LOG_LEVEL) CFLAGS+= -DLOG_LEVEL="${LOG_LEVEL}" .endif .if defined(BPF_VALIDATE) CFLAGS+= -DBPF_VALIDATE .endif .if defined(BPF_JIT) && \ (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386") SRCS+= ${SYSDIR}/net/bpf_jitter.c \ ${SYSDIR}/${MACHINE_ARCH}/${MACHINE_ARCH}/bpf_jit_machdep.c CFLAGS+= -DBPF_JIT_COMPILER LIBS+= -lutil -WARNS?= 6 .else SRCS+= ${SYSDIR}/net/bpf_filter.c WARNS?= 2 .endif .for TEST in ${TEST_CASES} ${TEST}: ${.CURDIR}/tests/${TEST}.h ${SRCS} @${CC} ${CFLAGS} -DBPF_TEST_H=\"${TEST}.h\" \ -o ${.CURDIR}/${TEST} ${SRCS} ${LIBS} .endfor all: ${TEST_CASES} .for TEST in ${TEST_CASES} .if defined(BPF_BENCHMARK) || !defined(LOG_LEVEL) || (${LOG_LEVEL} > 0) @${ECHO} -n "${TEST}: " .endif .if defined(BPF_BENCHMARK) @-time ${.CURDIR}/${TEST} .else @-env MALLOC_OPTIONS=J ${.CURDIR}/${TEST} .endif @rm -f ${.CURDIR}/${TEST} .endfor clean: .for TEST in ${TEST_CASES} @rm -f ${.CURDIR}/${TEST} .endfor .include diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile index c04223bbfec8..c31ca53f4579 100644 --- a/tools/regression/doat/Makefile +++ b/tools/regression/doat/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= doat MAN= -WARNS?=6 .include diff --git a/tools/regression/geom_gpt/Makefile b/tools/regression/geom_gpt/Makefile index 92d1f020c916..eb5a9659ff4f 100644 --- a/tools/regression/geom_gpt/Makefile +++ b/tools/regression/geom_gpt/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ PROG= gctl_test_helper MAN= LIBADD+= geom -WARNS?= 6 - .include diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile index ae9982ac1418..2bc346a7d6fc 100644 --- a/tools/regression/include/stdatomic/Makefile +++ b/tools/regression/include/stdatomic/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= logic -WARNS=6 MAN= .include diff --git a/tools/regression/netinet/ipbroadcast/Makefile b/tools/regression/netinet/ipbroadcast/Makefile index a1b497ae145c..c1e5bba93dcf 100644 --- a/tools/regression/netinet/ipbroadcast/Makefile +++ b/tools/regression/netinet/ipbroadcast/Makefile @@ -1,10 +1,8 @@ # # $FreeBSD$ # PROG= ipbroadcast MAN= -WARNS?= 6 - .include diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile index bea9d9c10e21..6f9debb7c2c3 100644 --- a/tools/regression/rpcsec_gss/Makefile +++ b/tools/regression/rpcsec_gss/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= rpctest MAN= -WARNS?= 6 LIBADD= rpcsec_gss DEBUG_FLAGS= -g -O0 .include diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile index e9bfba606c10..d3b3f42ce2a8 100644 --- a/tools/regression/sockets/accept_fd_leak/Makefile +++ b/tools/regression/sockets/accept_fd_leak/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= accept_fd_leak MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile index 4d337282eade..e7942ced5d02 100644 --- a/tools/regression/sockets/accf_data_attach/Makefile +++ b/tools/regression/sockets/accf_data_attach/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= accf_data_attach MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/fstat/Makefile b/tools/regression/sockets/fstat/Makefile index a583166d10c9..d5cb72419969 100644 --- a/tools/regression/sockets/fstat/Makefile +++ b/tools/regression/sockets/fstat/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= fstat MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile index 6771d25acf66..e37eadfbb203 100644 --- a/tools/regression/sockets/kqueue/Makefile +++ b/tools/regression/sockets/kqueue/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= kqueue MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile index e2eb1350710a..091d7a420c76 100644 --- a/tools/regression/sockets/listen_backlog/Makefile +++ b/tools/regression/sockets/listen_backlog/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= listen_backlog MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/listen_kqueue/Makefile b/tools/regression/sockets/listen_kqueue/Makefile index d49a597fc8f5..a506f262d06a 100644 --- a/tools/regression/sockets/listen_kqueue/Makefile +++ b/tools/regression/sockets/listen_kqueue/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= listen_kqueue MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile index 8f4dc4e922d4..ee147dad8cef 100644 --- a/tools/regression/sockets/listenclose/Makefile +++ b/tools/regression/sockets/listenclose/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= listenclose MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile index 1dc85ffbeff8..a52433c6ef26 100644 --- a/tools/regression/sockets/pr_atomic/Makefile +++ b/tools/regression/sockets/pr_atomic/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= pr_atomic MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile index d8fa5e09b502..285d075bca4b 100644 --- a/tools/regression/sockets/reconnect/Makefile +++ b/tools/regression/sockets/reconnect/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= reconnect MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile index f68b6c3a2e2c..fcb2e40acca1 100644 --- a/tools/regression/sockets/rtsocket/Makefile +++ b/tools/regression/sockets/rtsocket/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= rtsocket MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/sblock/Makefile b/tools/regression/sockets/sblock/Makefile index aa2f890bc447..1992a0a652ac 100644 --- a/tools/regression/sockets/sblock/Makefile +++ b/tools/regression/sockets/sblock/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= sblock MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile index 6e9c1ab70164..f1ba7a1cf596 100644 --- a/tools/regression/sockets/sendfile/Makefile +++ b/tools/regression/sockets/sendfile/Makefile @@ -1,10 +1,9 @@ # # $FreeBSD$ # PROG= sendfile MAN= -WARNS?= 6 LIBADD= md .include diff --git a/tools/regression/sockets/shutdown/Makefile b/tools/regression/sockets/shutdown/Makefile index 63045f5556ff..c36398c5af24 100644 --- a/tools/regression/sockets/shutdown/Makefile +++ b/tools/regression/sockets/shutdown/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= shutdown MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile index 51167011edb6..bd7720fbcbed 100644 --- a/tools/regression/sockets/sigpipe/Makefile +++ b/tools/regression/sockets/sigpipe/Makefile @@ -1,9 +1,8 @@ # # $FreeBSD$ # PROG= sigpipe MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile index 90111fb86bd5..eadb3efb1c36 100644 --- a/tools/regression/sockets/so_setfib/Makefile +++ b/tools/regression/sockets/so_setfib/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ .include PROG= so_setfib MAN= -WARNS?= 6 .if ${MK_INET} != "no" CFLAGS+= -DINET .endif .if ${MK_INET6} != "no" CFLAGS+= -DINET6 .endif .include diff --git a/tools/regression/sockets/udp_pingpong/Makefile b/tools/regression/sockets/udp_pingpong/Makefile index 2ec5b209ce2c..61e92ed73ce8 100644 --- a/tools/regression/sockets/udp_pingpong/Makefile +++ b/tools/regression/sockets/udp_pingpong/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= udp_pingpong MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile index 52cc8442be09..4bb4fc011ba4 100644 --- a/tools/regression/sockets/unix_bindconnect/Makefile +++ b/tools/regression/sockets/unix_bindconnect/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_bindconnect MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile index 370adc469896..690929edc2bc 100644 --- a/tools/regression/sockets/unix_close_race/Makefile +++ b/tools/regression/sockets/unix_close_race/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_close_race MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile index 184660965069..09ba07ae65ee 100644 --- a/tools/regression/sockets/unix_gc/Makefile +++ b/tools/regression/sockets/unix_gc/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_gc MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile index 75e7b9f0b606..7d26fc8b1383 100644 --- a/tools/regression/sockets/unix_sendtorace/Makefile +++ b/tools/regression/sockets/unix_sendtorace/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_sendtorace MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile index bb6045637ed1..7ebc03fc22f3 100644 --- a/tools/regression/sockets/unix_socket/Makefile +++ b/tools/regression/sockets/unix_socket/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_socket MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile index db0aa6ade00d..879dcc8ef533 100644 --- a/tools/regression/sockets/unix_sorflush/Makefile +++ b/tools/regression/sockets/unix_sorflush/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= unix_sorflush MAN= -WARNS?= 6 .include diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile index 18f7dd3e649a..9706b25ea899 100644 --- a/tools/regression/sockets/zerosend/Makefile +++ b/tools/regression/sockets/zerosend/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= zerosend MAN= -WARNS?= 6 .include diff --git a/tools/test/auxinfo/Makefile b/tools/test/auxinfo/Makefile index 0e6d80992ad8..f40c81d87652 100644 --- a/tools/test/auxinfo/Makefile +++ b/tools/test/auxinfo/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= auxinfo MAN= -WARNS?= 6 .include diff --git a/tools/test/iconv/posix/Makefile b/tools/test/iconv/posix/Makefile index 891142412df8..aafaadebafe7 100644 --- a/tools/test/iconv/posix/Makefile +++ b/tools/test/iconv/posix/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= posix MAN= -WARNS?= 6 - .include diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile index 455dec39920b..ac3fdd89486b 100644 --- a/tools/test/malloc/Makefile +++ b/tools/test/malloc/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ PROG= malloc SRCS= main.c .PATH: ${.CURDIR}/../../../lib/libc/stdlib MAN= -WARNS?=6 test: malloc @echo @csh -x -c "time ./malloc 500000 2000 8192" @csh -x -c "time ./malloc 50000000 2000 8192" @csh -x -c "time ./malloc 500000 14000 8192" @csh -x -c "time ./malloc 20000000 20000 2048" .include diff --git a/tools/test/net/Makefile b/tools/test/net/Makefile index e4c525920d8c..4fe5fb155cd1 100644 --- a/tools/test/net/Makefile +++ b/tools/test/net/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PROGS= listen connect MAN= -WARNS?= 6 test: ${PROGS} .include diff --git a/tools/test/netfibs/Makefile b/tools/test/netfibs/Makefile index 689d613616e1..7262a21356c8 100644 --- a/tools/test/netfibs/Makefile +++ b/tools/test/netfibs/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= reflect MAN= -WARNS?= 6 .include diff --git a/tools/test/ptrace/Makefile b/tools/test/ptrace/Makefile index a11b0a16a846..46e0aee6b53f 100644 --- a/tools/test/ptrace/Makefile +++ b/tools/test/ptrace/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= scescx MAN= -WARNS?= 6 .include diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile index 03c5dcda9ed9..9f2f4a7249cd 100644 --- a/tools/tools/aac/Makefile +++ b/tools/tools/aac/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= aac_checkq MAN= -WARNS?=6 BINDIR?=/usr/local/bin .include diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile index 5a49f2d38438..9f4dd10a2828 100644 --- a/tools/tools/cfi/Makefile +++ b/tools/tools/cfi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= cfi BINDIR= /usr/local/bin MAN= -WARNS?=6 .include diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile index ee6c46b11aa6..428a79e29200 100644 --- a/tools/tools/find-sb/Makefile +++ b/tools/tools/find-sb/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= find-sb MAN= -WARNS?= 6 .include diff --git a/tools/tools/fixwhite/Makefile b/tools/tools/fixwhite/Makefile index dbaabc25410b..235d5c7b9e34 100644 --- a/tools/tools/fixwhite/Makefile +++ b/tools/tools/fixwhite/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= fixwhite BINDIR= /usr/bin -WARNS= 6 .include diff --git a/tools/tools/gensnmpdef/Makefile b/tools/tools/gensnmpdef/Makefile index 470e1de2dc88..437e304d0ce7 100644 --- a/tools/tools/gensnmpdef/Makefile +++ b/tools/tools/gensnmpdef/Makefile @@ -1,24 +1,22 @@ # $FreeBSD$ .PATH: ${SRCTOP}/contrib/bsnmp/gensnmpdef PROG= gensnmpdef SRCS= gensnmpdef.c MAN= gensnmpdef.1 LOCALBASE?= /usr/local BINDIR= ${LOCALBASE}/bin MANDIR= ${LOCALBASE}/man/man CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib LDADD+= -lsmi -WARNS?= 6 - .include diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile index d38179254739..92321cad57d0 100644 --- a/tools/tools/ifpifa/Makefile +++ b/tools/tools/ifpifa/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= ifpifa MAN= -WARNS?=6 BINDIR?=/usr/local/bin LIBADD=kvm .include diff --git a/tools/tools/ioat/Makefile b/tools/tools/ioat/Makefile index 7db23b941997..32a0478eb0a3 100644 --- a/tools/tools/ioat/Makefile +++ b/tools/tools/ioat/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PROG= ioatcontrol MAN= ioatcontrol.8 BINDIR?= /usr/bin CFLAGS+= -I${SRCTOP}/sys/dev/ioat LIBADD= util -WARNS?= 6 - .include diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile index 49eccd30a0aa..8ebdd60ebc05 100644 --- a/tools/tools/iwi/Makefile +++ b/tools/tools/iwi/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= iwistats MAN= -WARNS?=6 .include diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile index b2683e115272..2fea81540bc0 100644 --- a/tools/tools/ncpus/Makefile +++ b/tools/tools/ncpus/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= ncpus MAN= SRCS= ncpus.c acpi.c .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= biosmptable.c .endif BINDIR= /usr/local/bin -WARNS?= 6 LIBADD= devinfo .include diff --git a/tools/tools/pciroms/Makefile b/tools/tools/pciroms/Makefile index 9e30d8510492..b317c4a72df9 100644 --- a/tools/tools/pciroms/Makefile +++ b/tools/tools/pciroms/Makefile @@ -1,10 +1,8 @@ # # $FreeBSD$ # PROG= pciroms MAN= -WARNS?= 6 - .include diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile index 2b4accaa2470..1aeafb632ce6 100644 --- a/tools/tools/syscall_timing/Makefile +++ b/tools/tools/syscall_timing/Makefile @@ -1,13 +1,11 @@ # # $FreeBSD$ # PROG= syscall_timing CFLAGS+= -static -O MAN= #LIBADD= pthread -WARNS= 6 - .include diff --git a/tools/tools/tscdrift/Makefile b/tools/tools/tscdrift/Makefile index fad714d6b058..d235972fb53a 100644 --- a/tools/tools/tscdrift/Makefile +++ b/tools/tools/tscdrift/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= tscdrift MAN= -WARNS?= 6 LIBADD= pthread m .include diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile index d963d83680d8..8e8c2fb33643 100644 --- a/tools/tools/vt/mkkfont/Makefile +++ b/tools/tools/vt/mkkfont/Makefile @@ -1,6 +1,6 @@ +# $FreeBSD$ + PROG= mkkfont MAN1= -WARNS?= 6 - .include diff --git a/usr.bin/dpv/Makefile b/usr.bin/dpv/Makefile index 93a6cd10db52..3e98b1103e64 100644 --- a/usr.bin/dpv/Makefile +++ b/usr.bin/dpv/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ PROG= dpv CFLAGS+= -I${.CURDIR} LIBADD= dpv dialog -WARNS?= 6 - .include diff --git a/usr.bin/getconf/tests/Makefile b/usr.bin/getconf/tests/Makefile index 3b2fdafc7bd0..f61bbabf1a09 100644 --- a/usr.bin/getconf/tests/Makefile +++ b/usr.bin/getconf/tests/Makefile @@ -1,11 +1,9 @@ # $FreeBSD$ ATF_TESTS_SH+= getconf_test PROGS+= arch_type BINDIR= ${TESTSDIR} -WARNS?= 6 - .include diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile index 622ca442640c..89aeefe813b7 100644 --- a/usr.bin/mkimg/Makefile +++ b/usr.bin/mkimg/Makefile @@ -1,42 +1,40 @@ # $FreeBSD$ .include PROG= mkimg SRCS+= format.c image.c mkimg.c scheme.c uuid.c MAN= mkimg.1 MKIMG_VERSION=20161016 mkimg.o: Makefile CFLAGS+=-DMKIMG_VERSION=${MKIMG_VERSION} CFLAGS+=-DSPARSE_WRITE CFLAGS+=-I${SRCTOP}/sys/sys/disk # List of formats to support SRCS+= \ qcow.c \ raw.c \ vhd.c \ vhdx.c \ vmdk.c # List of schemes to support SRCS+= \ apm.c \ bsd.c \ ebr.c \ gpt.c \ mbr.c \ vtoc8.c BINDIR?=/usr/bin LIBADD= util -WARNS?= 6 - HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/usr.bin/posixshmcontrol/Makefile b/usr.bin/posixshmcontrol/Makefile index df8f6ce39687..c6f847e18478 100644 --- a/usr.bin/posixshmcontrol/Makefile +++ b/usr.bin/posixshmcontrol/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= posixshmcontrol LIBADD= util -WARNS?= 6 .include diff --git a/usr.bin/proccontrol/Makefile b/usr.bin/proccontrol/Makefile index 61a3667481a8..94090963a0fb 100644 --- a/usr.bin/proccontrol/Makefile +++ b/usr.bin/proccontrol/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= proccontrol -WARNS?= 6 .include diff --git a/usr.bin/protect/Makefile b/usr.bin/protect/Makefile index 89bbda8a1bc2..dac81b296b68 100644 --- a/usr.bin/protect/Makefile +++ b/usr.bin/protect/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= protect -WARNS?= 6 .include diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index d3008f6e6271..908a60c6594a 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive dpv figpar ncursesw dialog m -WARNS?= 6 MAN= .include diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 1620c9b880df..044b83a8a1a0 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch ncursesw dialog m -WARNS?= 6 MAN= .include diff --git a/usr.sbin/bsnmpd/tools/Makefile.inc b/usr.sbin/bsnmpd/tools/Makefile.inc index 9d5ac4cdb810..db12061896d2 100644 --- a/usr.sbin/bsnmpd/tools/Makefile.inc +++ b/usr.sbin/bsnmpd/tools/Makefile.inc @@ -1,9 +1,7 @@ # $FreeBSD$ # Author: Shteryana Shopova BINDIR?= /usr/bin PACKAGE= bsnmp CFLAGS+= -I. -I${.CURDIR} - -WARNS?= 6 diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile index b038ebd524cc..08dcb79d0d84 100644 --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -1,30 +1,29 @@ # $FreeBSD$ .include CFLAGS+=-I${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include PROG= ctld SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/sys/cam/ctl CFLAGS+= -I${SRCTOP}/sys/dev/iscsi #CFLAGS+= -DICL_KERNEL_PROXY MAN= ctld.8 ctl.conf.5 LIBADD= bsdxml md sbuf util ucl m nv YFLAGS+= -v CLEANFILES= y.tab.c y.tab.h y.output -WARNS?= 6 NO_WMISSING_VARIABLE_DECLARATIONS= .if ${MK_ISCSI} != "no" CFLAGS+= -DWANT_ISCSI .endif .include diff --git a/usr.sbin/iovctl/Makefile b/usr.sbin/iovctl/Makefile index c9083eb6a1d1..42fca7dab71c 100644 --- a/usr.sbin/iovctl/Makefile +++ b/usr.sbin/iovctl/Makefile @@ -1,17 +1,15 @@ # $FreeBSD$ PROG= iovctl SRCS= iovctl.c parse.c validate.c LIBADD= nv ucl m CFLAGS+=-I${SRCTOP}/contrib/libucl/include -WARNS?=6 - MAN= \ iovctl.8 \ iovctl.conf.5 \ .include .include diff --git a/usr.sbin/mlx5tool/Makefile b/usr.sbin/mlx5tool/Makefile index bf5ec0674312..43b725516d2a 100644 --- a/usr.sbin/mlx5tool/Makefile +++ b/usr.sbin/mlx5tool/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= mlx5tool MAN= mlx5tool.8 -WARNS?= 6 .include diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile index 8c3cd36f8d0c..ecdb0fe1665d 100644 --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -1,34 +1,33 @@ # $FreeBSD$ PACKAGE= tests BINDIR= ${TESTSDIR} PROGS+= crypt -WARNS?= 6 LIBADD+= crypt ATF_TESTS_SH= pw_etcdir_test \ pw_lock_test \ pw_config_test \ pw_groupadd_test \ pw_groupdel_test \ pw_groupmod_test \ pw_groupshow_test \ pw_useradd_test \ pw_userdel_test \ pw_usermod_test \ pw_usernext_test \ pw_usershow_test .for tp in ${ATF_TESTS_SH} TEST_METADATA.${tp}+= required_user="root" .endfor ${PACKAGE}FILES+= group ${PACKAGE}FILES+= helper_functions.shin ${PACKAGE}FILES+= master.passwd ${PACKAGE}FILES+= pw.conf ${PACKAGE}FILES+= pw-modified.conf .include