aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2016-05-04 23:20:53 +0000
committerEnji Cooper <ngie@FreeBSD.org>2016-05-04 23:20:53 +0000
commit430f7286a566b1407c7b32ce13585caf5aa59b92 (patch)
treea3a2f2051c05cb9a95c4a94f6c5bbcd7a12cdfea
parente45163b2162def698a0320716097091257c39dea (diff)
downloadsrc-430f7286a566b1407c7b32ce13585caf5aa59b92.tar.gz
src-430f7286a566b1407c7b32ce13585caf5aa59b92.zip
Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installed
after r298107 Summary of changes: - Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that namespacing is kept with FILES appropriately, and that this shouldn't need to be repeated if the namespace changes -- only the definition of PACKAGE needs to be changed - Allow PACKAGE to be overridden by callers instead of forcing it to always be `tests`. In the event we get to the point where things can be split up enough in the base system, it would make more sense to group the tests with the blocks they're a part of, e.g. byacc with byacc-tests, etc - Remove PACKAGE definitions where possible, i.e. where FILES wasn't used previously. - Remove unnecessary TESTSPACKAGE definitions; this has been elided into bsd.tests.mk - Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES; ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk. - Fix installation of files under data/ subdirectories in lib/libc/tests/hash and lib/libc/tests/net/getaddrinfo - Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup) Document the proposed changes in share/examples/tests/tests/... via examples so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of replacing FILES. share/mk/bsd.README didn't seem like the appropriate method of communicating that info. MFC after: never probably X-MFC with: r298107 PR: 209114 Relnotes: yes Tested with: buildworld, installworld, checkworld; buildworld, packageworld Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=299094
-rw-r--r--bin/cat/tests/Makefile8
-rw-r--r--bin/date/tests/Makefile6
-rw-r--r--bin/dd/tests/Makefile4
-rw-r--r--bin/expr/tests/Makefile4
-rw-r--r--bin/ls/tests/Makefile4
-rw-r--r--bin/mv/tests/Makefile4
-rw-r--r--bin/pax/tests/Makefile4
-rw-r--r--bin/pkill/tests/Makefile4
-rw-r--r--bin/sh/tests/Makefile4
-rw-r--r--bin/sh/tests/builtins/Makefile333
-rw-r--r--bin/sh/tests/errors/Makefile51
-rw-r--r--bin/sh/tests/execution/Makefile95
-rw-r--r--bin/sh/tests/expansion/Makefile173
-rw-r--r--bin/sh/tests/parameters/Makefile39
-rw-r--r--bin/sh/tests/parser/Makefile153
-rw-r--r--bin/sh/tests/set-e/Makefile75
-rw-r--r--bin/sleep/tests/Makefile4
-rw-r--r--bin/test/tests/Makefile4
-rw-r--r--bin/tests/Makefile8
-rw-r--r--cddl/lib/tests/Makefile8
-rw-r--r--cddl/sbin/tests/Makefile8
-rw-r--r--cddl/tests/Makefile8
-rw-r--r--cddl/usr.bin/tests/Makefile8
-rw-r--r--cddl/usr.sbin/dtrace/tests/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/aggs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/arrays/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/assocs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/begin/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/buffering/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cg/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/clauses/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/cpc/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/decls/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/drops/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/end/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/enum/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/error/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/exit/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/funcs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/grammar/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/include/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/inline/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/io/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ip/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/java_api/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/json/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/lexer/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mdb/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/mib/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/misc/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/nfs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/operators/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pid/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pointers/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/pragma/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/predicates/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/print/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printa/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/printf/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/privs/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/probes/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/proc/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/providers/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/raise/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/rates/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/safety/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scalars/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sched/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/scripting/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sdt/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/speculation/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stability/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stack/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/stop/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strlen/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/struct/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/syscall/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/trace/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/translators/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/typedef/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/types/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/uctf/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/union/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/usdt/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/ustack/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/vars/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/version/Makefile4
-rw-r--r--cddl/usr.sbin/dtrace/tests/dtrace.test.mk8
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh4
-rw-r--r--cddl/usr.sbin/tests/Makefile8
-rw-r--r--gnu/lib/tests/Makefile8
-rw-r--r--gnu/tests/Makefile8
-rw-r--r--gnu/usr.bin/diff/tests/Makefile7
-rw-r--r--gnu/usr.bin/tests/Makefile8
-rw-r--r--lib/atf/libatf-c++/tests/Makefile9
-rw-r--r--lib/atf/libatf-c++/tests/detail/Makefile3
-rw-r--r--lib/atf/libatf-c/tests/Makefile7
-rw-r--r--lib/atf/libatf-c/tests/detail/Makefile6
-rw-r--r--lib/atf/tests/Makefile10
-rw-r--r--lib/atf/tests/test-programs/Makefile6
-rw-r--r--lib/libarchive/tests/Makefile380
-rw-r--r--lib/libc/tests/Makefile4
-rw-r--r--lib/libc/tests/c063/Makefile4
-rw-r--r--lib/libc/tests/db/Makefile6
-rw-r--r--lib/libc/tests/gen/Makefile4
-rw-r--r--lib/libc/tests/gen/execve/Makefile4
-rw-r--r--lib/libc/tests/gen/posix_spawn/Makefile4
-rw-r--r--lib/libc/tests/hash/Makefile21
-rw-r--r--lib/libc/tests/inet/Makefile4
-rw-r--r--lib/libc/tests/locale/Makefile4
-rw-r--r--lib/libc/tests/net/Makefile6
-rw-r--r--lib/libc/tests/net/getaddrinfo/Makefile21
-rw-r--r--lib/libc/tests/nss/Makefile5
-rw-r--r--lib/libc/tests/regex/Makefile64
-rw-r--r--lib/libc/tests/resolv/Makefile7
-rw-r--r--lib/libc/tests/rpc/Makefile4
-rw-r--r--lib/libc/tests/setjmp/Makefile4
-rw-r--r--lib/libc/tests/ssp/Makefile4
-rw-r--r--lib/libc/tests/stdio/Makefile4
-rw-r--r--lib/libc/tests/stdlib/Makefile4
-rw-r--r--lib/libc/tests/string/Makefile4
-rw-r--r--lib/libc/tests/sys/Makefile7
-rw-r--r--lib/libc/tests/termios/Makefile4
-rw-r--r--lib/libc/tests/time/Makefile4
-rw-r--r--lib/libc/tests/tls/Makefile4
-rw-r--r--lib/libc/tests/tls/dso/Makefile5
-rw-r--r--lib/libc/tests/tls_dso/Makefile4
-rw-r--r--lib/libc/tests/ttyio/Makefile4
-rw-r--r--lib/libcrypt/tests/Makefile4
-rw-r--r--lib/libmp/tests/Makefile4
-rw-r--r--lib/libnv/tests/Makefile4
-rw-r--r--lib/libpam/libpam/tests/Makefile4
-rw-r--r--lib/libproc/tests/Makefile4
-rw-r--r--lib/librt/tests/Makefile4
-rw-r--r--lib/libthr/tests/Makefile6
-rw-r--r--lib/libthr/tests/dlopen/Makefile3
-rw-r--r--lib/libthr/tests/dlopen/dso/Makefile5
-rw-r--r--lib/libutil/tests/Makefile4
-rw-r--r--lib/libxo/tests/Makefile416
-rw-r--r--lib/libxo/tests/encoder/Makefile4
-rw-r--r--lib/msun/tests/Makefile3
-rw-r--r--lib/tests/Makefile8
-rw-r--r--libexec/atf/atf-check/tests/Makefile6
-rw-r--r--libexec/atf/atf-sh/tests/Makefile6
-rw-r--r--libexec/atf/tests/Makefile8
-rw-r--r--libexec/rtld-elf/tests/Makefile5
-rw-r--r--libexec/rtld-elf/tests/libpythagoras/Makefile4
-rw-r--r--libexec/rtld-elf/tests/target/Makefile4
-rw-r--r--libexec/tests/Makefile8
-rw-r--r--sbin/devd/tests/Makefile4
-rw-r--r--sbin/dhclient/tests/Makefile6
-rw-r--r--sbin/growfs/tests/Makefile4
-rw-r--r--sbin/ifconfig/tests/Makefile4
-rw-r--r--sbin/mdconfig/tests/Makefile4
-rw-r--r--sbin/tests/Makefile8
-rw-r--r--secure/lib/tests/Makefile8
-rw-r--r--secure/libexec/tests/Makefile8
-rw-r--r--secure/tests/Makefile8
-rw-r--r--secure/usr.bin/tests/Makefile8
-rw-r--r--secure/usr.sbin/tests/Makefile8
-rw-r--r--share/examples/tests/Makefile8
-rw-r--r--share/examples/tests/tests/Makefile5
-rw-r--r--share/examples/tests/tests/atf/Makefile23
-rw-r--r--share/examples/tests/tests/atf/cp_test.sh4
-rw-r--r--share/examples/tests/tests/plain/Makefile23
-rw-r--r--share/examples/tests/tests/plain/cp_test.sh11
-rw-r--r--share/mk/bsd.test.mk7
-rw-r--r--share/mk/suite.test.mk4
-rw-r--r--share/tests/Makefile9
-rw-r--r--sys/modules/tests/callout_test/Makefile4
-rw-r--r--sys/modules/tests/framework/Makefile4
-rw-r--r--tests/Makefile19
-rw-r--r--tests/etc/Makefile6
-rw-r--r--tests/etc/rc.d/Makefile3
-rw-r--r--tests/sys/Makefile5
-rw-r--r--tests/sys/acl/Makefile13
-rw-r--r--tests/sys/aio/Makefile6
-rw-r--r--tests/sys/fifo/Makefile3
-rw-r--r--tests/sys/file/Makefile3
-rw-r--r--tests/sys/geom/Makefile3
-rw-r--r--tests/sys/geom/class/Makefile7
-rw-r--r--tests/sys/geom/class/concat/Makefile8
-rw-r--r--tests/sys/geom/class/eli/Makefile8
-rw-r--r--tests/sys/geom/class/gate/Makefile8
-rw-r--r--tests/sys/geom/class/mirror/Makefile8
-rw-r--r--tests/sys/geom/class/nop/Makefile8
-rw-r--r--tests/sys/geom/class/raid3/Makefile8
-rw-r--r--tests/sys/geom/class/shsec/Makefile8
-rw-r--r--tests/sys/geom/class/stripe/Makefile8
-rw-r--r--tests/sys/geom/class/uzip/Makefile13
-rw-r--r--tests/sys/kern/Makefile3
-rw-r--r--tests/sys/kern/acct/Makefile3
-rw-r--r--tests/sys/kern/execve/Makefile3
-rw-r--r--tests/sys/kern/pipe/Makefile3
-rw-r--r--tests/sys/kqueue/Makefile3
-rw-r--r--tests/sys/mac/Makefile3
-rw-r--r--tests/sys/mac/bsdextended/Makefile3
-rw-r--r--tests/sys/mac/portacl/Makefile6
-rw-r--r--tests/sys/mqueue/Makefile3
-rw-r--r--tests/sys/netinet/Makefile6
-rw-r--r--tests/sys/opencrypto/Makefile6
-rw-r--r--tests/sys/pjdfstest/Makefile4
-rw-r--r--tests/sys/pjdfstest/pjdfstest/Makefile5
-rw-r--r--tests/sys/pjdfstest/tests/Makefile7
-rw-r--r--tests/sys/pjdfstest/tests/chflags/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/chmod/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/chown/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/ftruncate/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/granular/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/link/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/mkdir/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/mkfifo/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/mknod/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/open/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/rename/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/rmdir/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/symlink/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/truncate/Makefile4
-rw-r--r--tests/sys/pjdfstest/tests/unlink/Makefile4
-rw-r--r--tests/sys/posixshm/Makefile3
-rw-r--r--tests/sys/sys/Makefile4
-rw-r--r--tests/sys/vfs/Makefile3
-rw-r--r--tests/sys/vm/Makefile3
-rw-r--r--usr.bin/apply/tests/Makefile13
-rw-r--r--usr.bin/basename/tests/Makefile4
-rw-r--r--usr.bin/bmake/tests/Makefile8
-rw-r--r--usr.bin/bmake/tests/archives/Makefile3
-rw-r--r--usr.bin/bmake/tests/archives/fmt_44bsd/Makefile50
-rw-r--r--usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile50
-rw-r--r--usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile49
-rw-r--r--usr.bin/bmake/tests/basic/Makefile3
-rw-r--r--usr.bin/bmake/tests/basic/t0/Makefile10
-rw-r--r--usr.bin/bmake/tests/basic/t1/Makefile12
-rw-r--r--usr.bin/bmake/tests/basic/t2/Makefile12
-rw-r--r--usr.bin/bmake/tests/basic/t3/Makefile10
-rw-r--r--usr.bin/bmake/tests/execution/Makefile3
-rw-r--r--usr.bin/bmake/tests/execution/ellipsis/Makefile12
-rw-r--r--usr.bin/bmake/tests/execution/empty/Makefile12
-rw-r--r--usr.bin/bmake/tests/execution/joberr/Makefile12
-rw-r--r--usr.bin/bmake/tests/execution/plus/Makefile12
-rw-r--r--usr.bin/bmake/tests/shell/Makefile3
-rw-r--r--usr.bin/bmake/tests/shell/builtin/Makefile20
-rw-r--r--usr.bin/bmake/tests/shell/meta/Makefile20
-rw-r--r--usr.bin/bmake/tests/shell/path/Makefile20
-rw-r--r--usr.bin/bmake/tests/shell/path_select/Makefile20
-rw-r--r--usr.bin/bmake/tests/shell/replace/Makefile20
-rw-r--r--usr.bin/bmake/tests/shell/select/Makefile18
-rw-r--r--usr.bin/bmake/tests/suffixes/Makefile3
-rw-r--r--usr.bin/bmake/tests/suffixes/basic/Makefile14
-rw-r--r--usr.bin/bmake/tests/suffixes/src_wild1/Makefile16
-rw-r--r--usr.bin/bmake/tests/suffixes/src_wild2/Makefile16
-rw-r--r--usr.bin/bmake/tests/syntax/Makefile3
-rw-r--r--usr.bin/bmake/tests/syntax/directive-t0/Makefile12
-rw-r--r--usr.bin/bmake/tests/syntax/enl/Makefile36
-rw-r--r--usr.bin/bmake/tests/syntax/funny-targets/Makefile18
-rw-r--r--usr.bin/bmake/tests/syntax/semi/Makefile18
-rw-r--r--usr.bin/bmake/tests/sysmk/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t0/2/1/Makefile12
-rw-r--r--usr.bin/bmake/tests/sysmk/t0/2/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t0/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t0/mk/Makefile9
-rw-r--r--usr.bin/bmake/tests/sysmk/t1/2/1/Makefile12
-rw-r--r--usr.bin/bmake/tests/sysmk/t1/2/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t1/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t1/mk/Makefile9
-rw-r--r--usr.bin/bmake/tests/sysmk/t2/2/1/Makefile12
-rw-r--r--usr.bin/bmake/tests/sysmk/t2/2/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t2/Makefile3
-rw-r--r--usr.bin/bmake/tests/sysmk/t2/mk/Makefile9
-rw-r--r--usr.bin/bmake/tests/variables/Makefile3
-rw-r--r--usr.bin/bmake/tests/variables/modifier_M/Makefile12
-rw-r--r--usr.bin/bmake/tests/variables/modifier_t/Makefile24
-rw-r--r--usr.bin/bmake/tests/variables/opt_V/Makefile18
-rw-r--r--usr.bin/bmake/tests/variables/t0/Makefile12
-rw-r--r--usr.bin/calendar/tests/Makefile64
-rw-r--r--usr.bin/cmp/tests/Makefile4
-rw-r--r--usr.bin/col/tests/Makefile6
-rw-r--r--usr.bin/comm/tests/Makefile23
-rw-r--r--usr.bin/cpio/tests/Makefile46
-rw-r--r--usr.bin/cut/tests/Makefile19
-rw-r--r--usr.bin/dirname/tests/Makefile6
-rw-r--r--usr.bin/file2c/tests/Makefile25
-rw-r--r--usr.bin/grep/tests/Makefile57
-rw-r--r--usr.bin/gzip/tests/Makefile4
-rw-r--r--usr.bin/ident/tests/Makefile6
-rw-r--r--usr.bin/join/tests/Makefile11
-rw-r--r--usr.bin/jot/tests/Makefile127
-rw-r--r--usr.bin/lastcomm/tests/Makefile27
-rw-r--r--usr.bin/limits/tests/Makefile4
-rw-r--r--usr.bin/m4/tests/Makefile89
-rw-r--r--usr.bin/mkimg/tests/Makefile9
-rw-r--r--usr.bin/ncal/tests/Makefile183
-rw-r--r--usr.bin/printf/tests/Makefile31
-rw-r--r--usr.bin/sdiff/tests/Makefile7
-rw-r--r--usr.bin/sed/tests/Makefile53
-rw-r--r--usr.bin/sed/tests/regress.multitest.out/Makefile262
-rw-r--r--usr.bin/soelim/tests/Makefile5
-rw-r--r--usr.bin/tar/tests/Makefile32
-rw-r--r--usr.bin/tests/Makefile9
-rw-r--r--usr.bin/timeout/tests/Makefile5
-rw-r--r--usr.bin/tr/tests/Makefile38
-rw-r--r--usr.bin/truncate/tests/Makefile4
-rw-r--r--usr.bin/units/tests/Makefile4
-rw-r--r--usr.bin/uudecode/tests/Makefile11
-rw-r--r--usr.bin/uuencode/tests/Makefile11
-rw-r--r--usr.bin/xargs/tests/Makefile43
-rw-r--r--usr.bin/xo/tests/Makefile40
-rw-r--r--usr.bin/yacc/tests/Makefile8
-rw-r--r--usr.sbin/chown/tests/Makefile4
-rw-r--r--usr.sbin/etcupdate/tests/Makefile4
-rw-r--r--usr.sbin/extattr/tests/Makefile4
-rw-r--r--usr.sbin/fstyp/tests/Makefile15
-rw-r--r--usr.sbin/makefs/tests/Makefile5
-rw-r--r--usr.sbin/newsyslog/tests/Makefile4
-rw-r--r--usr.sbin/nmtree/tests/Makefile23
-rw-r--r--usr.sbin/pw/tests/Makefile10
-rw-r--r--usr.sbin/rpcbind/tests/Makefile4
-rw-r--r--usr.sbin/sa/tests/Makefile51
-rw-r--r--usr.sbin/tests/Makefile8
337 files changed, 2184 insertions, 2889 deletions
diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile
index effd8393d889..2f4f70c29998 100644
--- a/bin/cat/tests/Makefile
+++ b/bin/cat/tests/Makefile
@@ -1,15 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
NETBSD_ATF_TESTS_SH= cat_test
-FILESDIR= ${TESTSDIR}
-
-FILES= d_align.in
-FILES+= d_align.out
+${PACKAGE}FILES+= d_align.in
+${PACKAGE}FILES+= d_align.out
.include <netbsd-tests.test.mk>
diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile
index cffb43f30efe..64d86d23bee6 100644
--- a/bin/date/tests/Makefile
+++ b/bin/date/tests/Makefile
@@ -1,11 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH= format_string_test
.include <bsd.test.mk>
diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile
index ad976718ecf9..dd04af915887 100644
--- a/bin/dd/tests/Makefile
+++ b/bin/dd/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= dd_test
.include <netbsd-tests.test.mk>
diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile
index 90331d0c9a9b..21b0e993fedc 100644
--- a/bin/expr/tests/Makefile
+++ b/bin/expr/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= expr_test
ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g'
diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile
index 2c3045b5cc10..89a2e8cf1dca 100644
--- a/bin/ls/tests/Makefile
+++ b/bin/ls/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH+= ls_tests
# This seems like overkill, but the idea in mind is that all of the testcases
# should be runnable as !root
diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile
index 62bc207bfe05..229d96e5766a 100644
--- a/bin/mv/tests/Makefile
+++ b/bin/mv/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= legacy_test
.include <bsd.test.mk>
diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile
index 6e2208715dc6..8334fea3c747 100644
--- a/bin/pax/tests/Makefile
+++ b/bin/pax/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>
diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile
index d6edfae4cd4b..be467074651f 100644
--- a/bin/pkill/tests/Makefile
+++ b/bin/pkill/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= pgrep-F_test
TAP_TESTS_SH+= pgrep-LF_test
TAP_TESTS_SH+= pgrep-P_test
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index 58834a433e31..d93e19aea7e1 100644
--- a/bin/sh/tests/Makefile
+++ b/bin/sh/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TESTS_SUBDIRS+= builtins
TESTS_SUBDIRS+= errors
TESTS_SUBDIRS+= execution
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
index b323daf1fe23..bd23550324c2 100644
--- a/bin/sh/tests/builtins/Makefile
+++ b/bin/sh/tests/builtins/Makefile
@@ -1,181 +1,178 @@
# $FreeBSD$
+PACKAGE= tests
+
.include <src.opts.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= alias.0 alias.0.stdout
-FILES+= alias.1 alias.1.stderr
-FILES+= alias3.0 alias3.0.stdout
-FILES+= alias4.0
-FILES+= break1.0
-FILES+= break2.0 break2.0.stdout
-FILES+= break3.0
-FILES+= break4.4
-FILES+= break5.4
-FILES+= break6.0
-FILES+= builtin1.0
-FILES+= case1.0
-FILES+= case2.0
-FILES+= case3.0
-FILES+= case4.0
-FILES+= case5.0
-FILES+= case6.0
-FILES+= case7.0
-FILES+= case8.0
-FILES+= case9.0
-FILES+= case10.0
-FILES+= case11.0
-FILES+= case12.0
-FILES+= case13.0
-FILES+= case14.0
-FILES+= case15.0
-FILES+= case16.0
-FILES+= case17.0
-FILES+= case18.0
-FILES+= case19.0
-FILES+= case20.0
-FILES+= cd1.0
-FILES+= cd2.0
-FILES+= cd3.0
-FILES+= cd4.0
-FILES+= cd5.0
-FILES+= cd6.0
-FILES+= cd7.0
-FILES+= cd8.0
-FILES+= cd9.0 cd9.0.stdout
-FILES+= command1.0
-FILES+= command2.0
-FILES+= command3.0
-FILES+= command3.0.stdout
-FILES+= command4.0
-FILES+= command5.0
-FILES+= command5.0.stdout
-FILES+= command6.0
-FILES+= command6.0.stdout
-FILES+= command7.0
-FILES+= command8.0
-FILES+= command9.0
-FILES+= command10.0
-FILES+= command11.0
-FILES+= command12.0
-FILES+= dot1.0
-FILES+= dot2.0
-FILES+= dot3.0
-FILES+= dot4.0
-FILES+= eval1.0
-FILES+= eval2.0
-FILES+= eval3.0
-FILES+= eval4.0
-FILES+= eval5.0
-FILES+= eval6.0
-FILES+= eval7.0
-FILES+= eval8.7
-FILES+= exec1.0
-FILES+= exec2.0
-FILES+= exit1.0
-FILES+= exit2.8
-FILES+= exit3.0
-FILES+= export1.0
-FILES+= fc1.0
-FILES+= fc2.0
-FILES+= for1.0
-FILES+= for2.0
-FILES+= for3.0
-FILES+= getopts1.0 getopts1.0.stdout
-FILES+= getopts2.0 getopts2.0.stdout
-FILES+= getopts3.0
-FILES+= getopts4.0
-FILES+= getopts5.0
-FILES+= getopts6.0
-FILES+= getopts7.0
-FILES+= getopts8.0 getopts8.0.stdout
-FILES+= getopts9.0 getopts9.0.stdout
-FILES+= getopts10.0
-FILES+= hash1.0 hash1.0.stdout
-FILES+= hash2.0 hash2.0.stdout
-FILES+= hash3.0 hash3.0.stdout
-FILES+= hash4.0
-FILES+= jobid1.0
-FILES+= jobid2.0
-FILES+= kill1.0 kill2.0
-FILES+= lineno.0 lineno.0.stdout
-FILES+= lineno2.0
-FILES+= lineno3.0 lineno3.0.stdout
-FILES+= local1.0
-FILES+= local2.0
-FILES+= local3.0
-FILES+= local4.0
-FILES+= local5.0
-FILES+= local6.0
-FILES+= local7.0
+${PACKAGE}FILES+= alias.0 alias.0.stdout
+${PACKAGE}FILES+= alias.1 alias.1.stderr
+${PACKAGE}FILES+= alias3.0 alias3.0.stdout
+${PACKAGE}FILES+= alias4.0
+${PACKAGE}FILES+= break1.0
+${PACKAGE}FILES+= break2.0 break2.0.stdout
+${PACKAGE}FILES+= break3.0
+${PACKAGE}FILES+= break4.4
+${PACKAGE}FILES+= break5.4
+${PACKAGE}FILES+= break6.0
+${PACKAGE}FILES+= builtin1.0
+${PACKAGE}FILES+= case1.0
+${PACKAGE}FILES+= case2.0
+${PACKAGE}FILES+= case3.0
+${PACKAGE}FILES+= case4.0
+${PACKAGE}FILES+= case5.0
+${PACKAGE}FILES+= case6.0
+${PACKAGE}FILES+= case7.0
+${PACKAGE}FILES+= case8.0
+${PACKAGE}FILES+= case9.0
+${PACKAGE}FILES+= case10.0
+${PACKAGE}FILES+= case11.0
+${PACKAGE}FILES+= case12.0
+${PACKAGE}FILES+= case13.0
+${PACKAGE}FILES+= case14.0
+${PACKAGE}FILES+= case15.0
+${PACKAGE}FILES+= case16.0
+${PACKAGE}FILES+= case17.0
+${PACKAGE}FILES+= case18.0
+${PACKAGE}FILES+= case19.0
+${PACKAGE}FILES+= case20.0
+${PACKAGE}FILES+= cd1.0
+${PACKAGE}FILES+= cd2.0
+${PACKAGE}FILES+= cd3.0
+${PACKAGE}FILES+= cd4.0
+${PACKAGE}FILES+= cd5.0
+${PACKAGE}FILES+= cd6.0
+${PACKAGE}FILES+= cd7.0
+${PACKAGE}FILES+= cd8.0
+${PACKAGE}FILES+= cd9.0 cd9.0.stdout
+${PACKAGE}FILES+= command1.0
+${PACKAGE}FILES+= command2.0
+${PACKAGE}FILES+= command3.0
+${PACKAGE}FILES+= command3.0.stdout
+${PACKAGE}FILES+= command4.0
+${PACKAGE}FILES+= command5.0
+${PACKAGE}FILES+= command5.0.stdout
+${PACKAGE}FILES+= command6.0
+${PACKAGE}FILES+= command6.0.stdout
+${PACKAGE}FILES+= command7.0
+${PACKAGE}FILES+= command8.0
+${PACKAGE}FILES+= command9.0
+${PACKAGE}FILES+= command10.0
+${PACKAGE}FILES+= command11.0
+${PACKAGE}FILES+= command12.0
+${PACKAGE}FILES+= dot1.0
+${PACKAGE}FILES+= dot2.0
+${PACKAGE}FILES+= dot3.0
+${PACKAGE}FILES+= dot4.0
+${PACKAGE}FILES+= eval1.0
+${PACKAGE}FILES+= eval2.0
+${PACKAGE}FILES+= eval3.0
+${PACKAGE}FILES+= eval4.0
+${PACKAGE}FILES+= eval5.0
+${PACKAGE}FILES+= eval6.0
+${PACKAGE}FILES+= eval7.0
+${PACKAGE}FILES+= eval8.7
+${PACKAGE}FILES+= exec1.0
+${PACKAGE}FILES+= exec2.0
+${PACKAGE}FILES+= exit1.0
+${PACKAGE}FILES+= exit2.8
+${PACKAGE}FILES+= exit3.0
+${PACKAGE}FILES+= export1.0
+${PACKAGE}FILES+= fc1.0
+${PACKAGE}FILES+= fc2.0
+${PACKAGE}FILES+= for1.0
+${PACKAGE}FILES+= for2.0
+${PACKAGE}FILES+= for3.0
+${PACKAGE}FILES+= getopts1.0 getopts1.0.stdout
+${PACKAGE}FILES+= getopts2.0 getopts2.0.stdout
+${PACKAGE}FILES+= getopts3.0
+${PACKAGE}FILES+= getopts4.0
+${PACKAGE}FILES+= getopts5.0
+${PACKAGE}FILES+= getopts6.0
+${PACKAGE}FILES+= getopts7.0
+${PACKAGE}FILES+= getopts8.0 getopts8.0.stdout
+${PACKAGE}FILES+= getopts9.0 getopts9.0.stdout
+${PACKAGE}FILES+= getopts10.0
+${PACKAGE}FILES+= hash1.0 hash1.0.stdout
+${PACKAGE}FILES+= hash2.0 hash2.0.stdout
+${PACKAGE}FILES+= hash3.0 hash3.0.stdout
+${PACKAGE}FILES+= hash4.0
+${PACKAGE}FILES+= jobid1.0
+${PACKAGE}FILES+= jobid2.0
+${PACKAGE}FILES+= kill1.0 kill2.0
+${PACKAGE}FILES+= lineno.0 lineno.0.stdout
+${PACKAGE}FILES+= lineno2.0
+${PACKAGE}FILES+= lineno3.0 lineno3.0.stdout
+${PACKAGE}FILES+= local1.0
+${PACKAGE}FILES+= local2.0
+${PACKAGE}FILES+= local3.0
+${PACKAGE}FILES+= local4.0
+${PACKAGE}FILES+= local5.0
+${PACKAGE}FILES+= local6.0
+${PACKAGE}FILES+= local7.0
.if ${MK_NLS} != "no"
-FILES+= locale1.0
+${PACKAGE}FILES+= locale1.0
.endif
-FILES+= printf1.0
-FILES+= printf2.0
-FILES+= printf3.0
-FILES+= printf4.0
-FILES+= read1.0 read1.0.stdout
-FILES+= read2.0
-FILES+= read3.0 read3.0.stdout
-FILES+= read4.0 read4.0.stdout
-FILES+= read5.0
-FILES+= read6.0
-FILES+= read7.0
-FILES+= read8.0
-FILES+= read9.0
-FILES+= return1.0
-FILES+= return2.1
-FILES+= return3.1
-FILES+= return4.0
-FILES+= return5.0
-FILES+= return6.4
-FILES+= return7.4
-FILES+= return8.0
-FILES+= set1.0
-FILES+= set2.0
-FILES+= set3.0
-FILES+= trap1.0
-FILES+= trap10.0
-FILES+= trap11.0
-FILES+= trap12.0
-FILES+= trap13.0
-FILES+= trap14.0
-FILES+= trap15.0
-FILES+= trap16.0
-FILES+= trap17.0
-FILES+= trap2.0
-FILES+= trap3.0
-FILES+= trap4.0
-FILES+= trap5.0
-FILES+= trap6.0
-FILES+= trap7.0
-FILES+= trap8.0
-FILES+= trap9.0
-FILES+= type1.0 type1.0.stderr
-FILES+= type2.0
-FILES+= type3.0
-FILES+= unalias.0
-FILES+= var-assign.0
-FILES+= var-assign2.0
-FILES+= wait1.0
-FILES+= wait2.0
-FILES+= wait3.0
-FILES+= wait4.0
-FILES+= wait5.0
-FILES+= wait6.0
-FILES+= wait7.0
-FILES+= wait8.0
-FILES+= wait9.127
-FILES+= wait10.0
+${PACKAGE}FILES+= printf1.0
+${PACKAGE}FILES+= printf2.0
+${PACKAGE}FILES+= printf3.0
+${PACKAGE}FILES+= printf4.0
+${PACKAGE}FILES+= read1.0 read1.0.stdout
+${PACKAGE}FILES+= read2.0
+${PACKAGE}FILES+= read3.0 read3.0.stdout
+${PACKAGE}FILES+= read4.0 read4.0.stdout
+${PACKAGE}FILES+= read5.0
+${PACKAGE}FILES+= read6.0
+${PACKAGE}FILES+= read7.0
+${PACKAGE}FILES+= read8.0
+${PACKAGE}FILES+= read9.0
+${PACKAGE}FILES+= return1.0
+${PACKAGE}FILES+= return2.1
+${PACKAGE}FILES+= return3.1
+${PACKAGE}FILES+= return4.0
+${PACKAGE}FILES+= return5.0
+${PACKAGE}FILES+= return6.4
+${PACKAGE}FILES+= return7.4
+${PACKAGE}FILES+= return8.0
+${PACKAGE}FILES+= set1.0
+${PACKAGE}FILES+= set2.0
+${PACKAGE}FILES+= set3.0
+${PACKAGE}FILES+= trap1.0
+${PACKAGE}FILES+= trap10.0
+${PACKAGE}FILES+= trap11.0
+${PACKAGE}FILES+= trap12.0
+${PACKAGE}FILES+= trap13.0
+${PACKAGE}FILES+= trap14.0
+${PACKAGE}FILES+= trap15.0
+${PACKAGE}FILES+= trap16.0
+${PACKAGE}FILES+= trap17.0
+${PACKAGE}FILES+= trap2.0
+${PACKAGE}FILES+= trap3.0
+${PACKAGE}FILES+= trap4.0
+${PACKAGE}FILES+= trap5.0
+${PACKAGE}FILES+= trap6.0
+${PACKAGE}FILES+= trap7.0
+${PACKAGE}FILES+= trap8.0
+${PACKAGE}FILES+= trap9.0
+${PACKAGE}FILES+= type1.0 type1.0.stderr
+${PACKAGE}FILES+= type2.0
+${PACKAGE}FILES+= type3.0
+${PACKAGE}FILES+= unalias.0
+${PACKAGE}FILES+= var-assign.0
+${PACKAGE}FILES+= var-assign2.0
+${PACKAGE}FILES+= wait1.0
+${PACKAGE}FILES+= wait2.0
+${PACKAGE}FILES+= wait3.0
+${PACKAGE}FILES+= wait4.0
+${PACKAGE}FILES+= wait5.0
+${PACKAGE}FILES+= wait6.0
+${PACKAGE}FILES+= wait7.0
+${PACKAGE}FILES+= wait8.0
+${PACKAGE}FILES+= wait9.127
+${PACKAGE}FILES+= wait10.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile
index f7c7e267ae5b..c50417c350db 100644
--- a/bin/sh/tests/errors/Makefile
+++ b/bin/sh/tests/errors/Makefile
@@ -1,37 +1,34 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= assignment-error1.0
-FILES+= assignment-error2.0
-FILES+= backquote-error1.0
-FILES+= backquote-error2.0
-FILES+= bad-binary1.126
-FILES+= bad-keyword1.0
-FILES+= bad-parm-exp1.0
-FILES+= bad-parm-exp2.2 bad-parm-exp2.2.stderr
-FILES+= bad-parm-exp3.2 bad-parm-exp3.2.stderr
-FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr
-FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr
-FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr
-FILES+= bad-parm-exp7.0
-FILES+= bad-parm-exp8.0
-FILES+= option-error.0
-FILES+= redirection-error.0
-FILES+= redirection-error2.2
-FILES+= redirection-error3.0
-FILES+= redirection-error4.0
-FILES+= redirection-error5.0
-FILES+= redirection-error6.0
-FILES+= redirection-error7.0
-FILES+= write-error1.0
+${PACKAGE}FILES+= assignment-error1.0
+${PACKAGE}FILES+= assignment-error2.0
+${PACKAGE}FILES+= backquote-error1.0
+${PACKAGE}FILES+= backquote-error2.0
+${PACKAGE}FILES+= bad-binary1.126
+${PACKAGE}FILES+= bad-keyword1.0
+${PACKAGE}FILES+= bad-parm-exp1.0
+${PACKAGE}FILES+= bad-parm-exp2.2 bad-parm-exp2.2.stderr
+${PACKAGE}FILES+= bad-parm-exp3.2 bad-parm-exp3.2.stderr
+${PACKAGE}FILES+= bad-parm-exp4.2 bad-parm-exp4.2.stderr
+${PACKAGE}FILES+= bad-parm-exp5.2 bad-parm-exp5.2.stderr
+${PACKAGE}FILES+= bad-parm-exp6.2 bad-parm-exp6.2.stderr
+${PACKAGE}FILES+= bad-parm-exp7.0
+${PACKAGE}FILES+= bad-parm-exp8.0
+${PACKAGE}FILES+= option-error.0
+${PACKAGE}FILES+= redirection-error.0
+${PACKAGE}FILES+= redirection-error2.2
+${PACKAGE}FILES+= redirection-error3.0
+${PACKAGE}FILES+= redirection-error4.0
+${PACKAGE}FILES+= redirection-error5.0
+${PACKAGE}FILES+= redirection-error6.0
+${PACKAGE}FILES+= redirection-error7.0
+${PACKAGE}FILES+= write-error1.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile
index 64d12deda965..92aecc854d15 100644
--- a/bin/sh/tests/execution/Makefile
+++ b/bin/sh/tests/execution/Makefile
@@ -1,59 +1,56 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= bg1.0
-FILES+= bg2.0
-FILES+= bg3.0
-FILES+= bg4.0
-FILES+= bg5.0
-FILES+= bg6.0 bg6.0.stdout
-FILES+= bg7.0
-FILES+= bg8.0
-FILES+= bg9.0
-FILES+= bg10.0 bg10.0.stdout
-FILES+= fork1.0
-FILES+= fork2.0
-FILES+= fork3.0
-FILES+= func1.0
-FILES+= func2.0
-FILES+= func3.0
-FILES+= hash1.0
-FILES+= int-cmd1.0
-FILES+= killed1.0
-FILES+= killed2.0
-FILES+= not1.0
-FILES+= not2.0
-FILES+= path1.0
-FILES+= redir1.0
-FILES+= redir2.0
-FILES+= redir3.0
-FILES+= redir4.0
-FILES+= redir5.0
-FILES+= redir6.0
-FILES+= redir7.0
-FILES+= set-n1.0
-FILES+= set-n2.0
-FILES+= set-n3.0
-FILES+= set-n4.0
-FILES+= set-x1.0
-FILES+= set-x2.0
-FILES+= set-x3.0
-FILES+= set-x4.0
-FILES+= shellproc1.0
-FILES+= subshell1.0 subshell1.0.stdout
-FILES+= subshell2.0
-FILES+= subshell3.0
-FILES+= subshell4.0
-FILES+= unknown1.0
-FILES+= var-assign1.0
+${PACKAGE}FILES+= bg1.0
+${PACKAGE}FILES+= bg2.0
+${PACKAGE}FILES+= bg3.0
+${PACKAGE}FILES+= bg4.0
+${PACKAGE}FILES+= bg5.0
+${PACKAGE}FILES+= bg6.0 bg6.0.stdout
+${PACKAGE}FILES+= bg7.0
+${PACKAGE}FILES+= bg8.0
+${PACKAGE}FILES+= bg9.0
+${PACKAGE}FILES+= bg10.0 bg10.0.stdout
+${PACKAGE}FILES+= fork1.0
+${PACKAGE}FILES+= fork2.0
+${PACKAGE}FILES+= fork3.0
+${PACKAGE}FILES+= func1.0
+${PACKAGE}FILES+= func2.0
+${PACKAGE}FILES+= func3.0
+${PACKAGE}FILES+= hash1.0
+${PACKAGE}FILES+= int-cmd1.0
+${PACKAGE}FILES+= killed1.0
+${PACKAGE}FILES+= killed2.0
+${PACKAGE}FILES+= not1.0
+${PACKAGE}FILES+= not2.0
+${PACKAGE}FILES+= path1.0
+${PACKAGE}FILES+= redir1.0
+${PACKAGE}FILES+= redir2.0
+${PACKAGE}FILES+= redir3.0
+${PACKAGE}FILES+= redir4.0
+${PACKAGE}FILES+= redir5.0
+${PACKAGE}FILES+= redir6.0
+${PACKAGE}FILES+= redir7.0
+${PACKAGE}FILES+= set-n1.0
+${PACKAGE}FILES+= set-n2.0
+${PACKAGE}FILES+= set-n3.0
+${PACKAGE}FILES+= set-n4.0
+${PACKAGE}FILES+= set-x1.0
+${PACKAGE}FILES+= set-x2.0
+${PACKAGE}FILES+= set-x3.0
+${PACKAGE}FILES+= set-x4.0
+${PACKAGE}FILES+= shellproc1.0
+${PACKAGE}FILES+= subshell1.0 subshell1.0.stdout
+${PACKAGE}FILES+= subshell2.0
+${PACKAGE}FILES+= subshell3.0
+${PACKAGE}FILES+= subshell4.0
+${PACKAGE}FILES+= unknown1.0
+${PACKAGE}FILES+= var-assign1.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
index 351babdf84d5..1726ff0f2ad8 100644
--- a/bin/sh/tests/expansion/Makefile
+++ b/bin/sh/tests/expansion/Makefile
@@ -1,98 +1,95 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= arith1.0
-FILES+= arith2.0
-FILES+= arith3.0
-FILES+= arith4.0
-FILES+= arith5.0
-FILES+= arith6.0
-FILES+= arith7.0
-FILES+= arith8.0
-FILES+= arith9.0
-FILES+= arith10.0
-FILES+= arith11.0
-FILES+= arith12.0
-FILES+= arith13.0
-FILES+= arith14.0
-FILES+= assign1.0
-FILES+= cmdsubst1.0
-FILES+= cmdsubst2.0
-FILES+= cmdsubst3.0
-FILES+= cmdsubst4.0
-FILES+= cmdsubst5.0
-FILES+= cmdsubst6.0
-FILES+= cmdsubst7.0
-FILES+= cmdsubst8.0
-FILES+= cmdsubst9.0
-FILES+= cmdsubst10.0
-FILES+= cmdsubst11.0
-FILES+= cmdsubst12.0
-FILES+= cmdsubst13.0
-FILES+= cmdsubst14.0
-FILES+= cmdsubst15.0
-FILES+= cmdsubst16.0
-FILES+= cmdsubst17.0
-FILES+= export1.0
-FILES+= export2.0
-FILES+= export3.0
-FILES+= heredoc1.0
-FILES+= heredoc2.0
-FILES+= ifs1.0
-FILES+= ifs2.0
-FILES+= ifs3.0
-FILES+= ifs4.0
-FILES+= ifs5.0
-FILES+= ifs6.0
-FILES+= ifs7.0
-FILES+= length1.0
-FILES+= length2.0
-FILES+= length3.0
-FILES+= length4.0
-FILES+= length5.0
-FILES+= length6.0
-FILES+= length7.0
-FILES+= length8.0
-FILES+= local1.0
-FILES+= local2.0
-FILES+= pathname1.0
-FILES+= pathname2.0
-FILES+= pathname3.0
-FILES+= pathname4.0
-FILES+= pathname5.0
-FILES+= plus-minus1.0
-FILES+= plus-minus2.0
-FILES+= plus-minus3.0
-FILES+= plus-minus4.0
-FILES+= plus-minus5.0
-FILES+= plus-minus6.0
-FILES+= plus-minus7.0
-FILES+= plus-minus8.0
-FILES+= question1.0
-FILES+= readonly1.0
-FILES+= redir1.0
-FILES+= set-u1.0
-FILES+= set-u2.0
-FILES+= set-u3.0
-FILES+= tilde1.0
-FILES+= tilde2.0
-FILES+= trim1.0
-FILES+= trim2.0
-FILES+= trim3.0
-FILES+= trim4.0
-FILES+= trim5.0
-FILES+= trim6.0
-FILES+= trim7.0
-FILES+= trim8.0
-FILES+= trim9.0
+${PACKAGE}FILES+= arith1.0
+${PACKAGE}FILES+= arith2.0
+${PACKAGE}FILES+= arith3.0
+${PACKAGE}FILES+= arith4.0
+${PACKAGE}FILES+= arith5.0
+${PACKAGE}FILES+= arith6.0
+${PACKAGE}FILES+= arith7.0
+${PACKAGE}FILES+= arith8.0
+${PACKAGE}FILES+= arith9.0
+${PACKAGE}FILES+= arith10.0
+${PACKAGE}FILES+= arith11.0
+${PACKAGE}FILES+= arith12.0
+${PACKAGE}FILES+= arith13.0
+${PACKAGE}FILES+= arith14.0
+${PACKAGE}FILES+= assign1.0
+${PACKAGE}FILES+= cmdsubst1.0
+${PACKAGE}FILES+= cmdsubst2.0
+${PACKAGE}FILES+= cmdsubst3.0
+${PACKAGE}FILES+= cmdsubst4.0
+${PACKAGE}FILES+= cmdsubst5.0
+${PACKAGE}FILES+= cmdsubst6.0
+${PACKAGE}FILES+= cmdsubst7.0
+${PACKAGE}FILES+= cmdsubst8.0
+${PACKAGE}FILES+= cmdsubst9.0
+${PACKAGE}FILES+= cmdsubst10.0
+${PACKAGE}FILES+= cmdsubst11.0
+${PACKAGE}FILES+= cmdsubst12.0
+${PACKAGE}FILES+= cmdsubst13.0
+${PACKAGE}FILES+= cmdsubst14.0
+${PACKAGE}FILES+= cmdsubst15.0
+${PACKAGE}FILES+= cmdsubst16.0
+${PACKAGE}FILES+= cmdsubst17.0
+${PACKAGE}FILES+= export1.0
+${PACKAGE}FILES+= export2.0
+${PACKAGE}FILES+= export3.0
+${PACKAGE}FILES+= heredoc1.0
+${PACKAGE}FILES+= heredoc2.0
+${PACKAGE}FILES+= ifs1.0
+${PACKAGE}FILES+= ifs2.0
+${PACKAGE}FILES+= ifs3.0
+${PACKAGE}FILES+= ifs4.0
+${PACKAGE}FILES+= ifs5.0
+${PACKAGE}FILES+= ifs6.0
+${PACKAGE}FILES+= ifs7.0
+${PACKAGE}FILES+= length1.0
+${PACKAGE}FILES+= length2.0
+${PACKAGE}FILES+= length3.0
+${PACKAGE}FILES+= length4.0
+${PACKAGE}FILES+= length5.0
+${PACKAGE}FILES+= length6.0
+${PACKAGE}FILES+= length7.0
+${PACKAGE}FILES+= length8.0
+${PACKAGE}FILES+= local1.0
+${PACKAGE}FILES+= local2.0
+${PACKAGE}FILES+= pathname1.0
+${PACKAGE}FILES+= pathname2.0
+${PACKAGE}FILES+= pathname3.0
+${PACKAGE}FILES+= pathname4.0
+${PACKAGE}FILES+= pathname5.0
+${PACKAGE}FILES+= plus-minus1.0
+${PACKAGE}FILES+= plus-minus2.0
+${PACKAGE}FILES+= plus-minus3.0
+${PACKAGE}FILES+= plus-minus4.0
+${PACKAGE}FILES+= plus-minus5.0
+${PACKAGE}FILES+= plus-minus6.0
+${PACKAGE}FILES+= plus-minus7.0
+${PACKAGE}FILES+= plus-minus8.0
+${PACKAGE}FILES+= question1.0
+${PACKAGE}FILES+= readonly1.0
+${PACKAGE}FILES+= redir1.0
+${PACKAGE}FILES+= set-u1.0
+${PACKAGE}FILES+= set-u2.0
+${PACKAGE}FILES+= set-u3.0
+${PACKAGE}FILES+= tilde1.0
+${PACKAGE}FILES+= tilde2.0
+${PACKAGE}FILES+= trim1.0
+${PACKAGE}FILES+= trim2.0
+${PACKAGE}FILES+= trim3.0
+${PACKAGE}FILES+= trim4.0
+${PACKAGE}FILES+= trim5.0
+${PACKAGE}FILES+= trim6.0
+${PACKAGE}FILES+= trim7.0
+${PACKAGE}FILES+= trim8.0
+${PACKAGE}FILES+= trim9.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile
index d510779d049a..28c503a1b1e7 100644
--- a/bin/sh/tests/parameters/Makefile
+++ b/bin/sh/tests/parameters/Makefile
@@ -1,31 +1,28 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= env1.0
-FILES+= exitstatus1.0
-FILES+= mail1.0
-FILES+= mail2.0
-FILES+= optind1.0
-FILES+= optind2.0
-FILES+= positional1.0
-FILES+= positional2.0
-FILES+= positional3.0
-FILES+= positional4.0
-FILES+= positional5.0
-FILES+= positional6.0
-FILES+= positional7.0
-FILES+= positional8.0
-FILES+= positional9.0
-FILES+= pwd1.0
-FILES+= pwd2.0
+${PACKAGE}FILES+= env1.0
+${PACKAGE}FILES+= exitstatus1.0
+${PACKAGE}FILES+= mail1.0
+${PACKAGE}FILES+= mail2.0
+${PACKAGE}FILES+= optind1.0
+${PACKAGE}FILES+= optind2.0
+${PACKAGE}FILES+= positional1.0
+${PACKAGE}FILES+= positional2.0
+${PACKAGE}FILES+= positional3.0
+${PACKAGE}FILES+= positional4.0
+${PACKAGE}FILES+= positional5.0
+${PACKAGE}FILES+= positional6.0
+${PACKAGE}FILES+= positional7.0
+${PACKAGE}FILES+= positional8.0
+${PACKAGE}FILES+= positional9.0
+${PACKAGE}FILES+= pwd1.0
+${PACKAGE}FILES+= pwd2.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
index 4f823b05f4cd..b5ac5661063b 100644
--- a/bin/sh/tests/parser/Makefile
+++ b/bin/sh/tests/parser/Makefile
@@ -1,88 +1,85 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= alias1.0
-FILES+= alias2.0
-FILES+= alias3.0
-FILES+= alias4.0
-FILES+= alias5.0
-FILES+= alias6.0
-FILES+= alias7.0
-FILES+= alias8.0
-FILES+= alias9.0
-FILES+= alias10.0
-FILES+= alias11.0
-FILES+= alias12.0
-FILES+= alias13.0
-FILES+= alias14.0
-FILES+= alias15.0 alias15.0.stdout
-FILES+= and-pipe-not.0
-FILES+= case1.0
-FILES+= case2.0
-FILES+= comment1.0
-FILES+= comment2.42
-FILES+= dollar-quote1.0
-FILES+= dollar-quote2.0
-FILES+= dollar-quote3.0
-FILES+= dollar-quote4.0
-FILES+= dollar-quote5.0
-FILES+= dollar-quote6.0
-FILES+= dollar-quote7.0
-FILES+= dollar-quote8.0
-FILES+= dollar-quote9.0
-FILES+= dollar-quote10.0
-FILES+= dollar-quote11.0
-FILES+= dollar-quote12.0
-FILES+= dollar-quote13.0
-FILES+= empty-braces1.0
-FILES+= empty-cmd1.0
-FILES+= for1.0
-FILES+= for2.0
-FILES+= func1.0
-FILES+= func2.0
-FILES+= func3.0
-FILES+= heredoc1.0
-FILES+= heredoc2.0
-FILES+= heredoc3.0
-FILES+= heredoc4.0
-FILES+= heredoc5.0
-FILES+= heredoc6.0
-FILES+= heredoc7.0
-FILES+= heredoc8.0
-FILES+= heredoc9.0
-FILES+= heredoc10.0
-FILES+= heredoc11.0
-FILES+= heredoc12.0
-FILES+= heredoc13.0
-FILES+= line-cont1.0
-FILES+= line-cont2.0
-FILES+= line-cont3.0
-FILES+= line-cont4.0
-FILES+= line-cont5.0
-FILES+= line-cont6.0
-FILES+= line-cont7.0
-FILES+= line-cont8.0
-FILES+= line-cont9.0
-FILES+= line-cont10.0
-FILES+= line-cont11.0
-FILES+= no-space1.0
-FILES+= no-space2.0
-FILES+= nul1.0
-FILES+= only-redir1.0
-FILES+= only-redir2.0
-FILES+= only-redir3.0
-FILES+= only-redir4.0
-FILES+= pipe-not1.0
-FILES+= set-v1.0 set-v1.0.stderr
-FILES+= var-assign1.0
+${PACKAGE}FILES+= alias1.0
+${PACKAGE}FILES+= alias2.0
+${PACKAGE}FILES+= alias3.0
+${PACKAGE}FILES+= alias4.0
+${PACKAGE}FILES+= alias5.0
+${PACKAGE}FILES+= alias6.0
+${PACKAGE}FILES+= alias7.0
+${PACKAGE}FILES+= alias8.0
+${PACKAGE}FILES+= alias9.0
+${PACKAGE}FILES+= alias10.0
+${PACKAGE}FILES+= alias11.0
+${PACKAGE}FILES+= alias12.0
+${PACKAGE}FILES+= alias13.0
+${PACKAGE}FILES+= alias14.0
+${PACKAGE}FILES+= alias15.0 alias15.0.stdout
+${PACKAGE}FILES+= and-pipe-not.0
+${PACKAGE}FILES+= case1.0
+${PACKAGE}FILES+= case2.0
+${PACKAGE}FILES+= comment1.0
+${PACKAGE}FILES+= comment2.42
+${PACKAGE}FILES+= dollar-quote1.0
+${PACKAGE}FILES+= dollar-quote2.0
+${PACKAGE}FILES+= dollar-quote3.0
+${PACKAGE}FILES+= dollar-quote4.0
+${PACKAGE}FILES+= dollar-quote5.0
+${PACKAGE}FILES+= dollar-quote6.0
+${PACKAGE}FILES+= dollar-quote7.0
+${PACKAGE}FILES+= dollar-quote8.0
+${PACKAGE}FILES+= dollar-quote9.0
+${PACKAGE}FILES+= dollar-quote10.0
+${PACKAGE}FILES+= dollar-quote11.0
+${PACKAGE}FILES+= dollar-quote12.0
+${PACKAGE}FILES+= dollar-quote13.0
+${PACKAGE}FILES+= empty-braces1.0
+${PACKAGE}FILES+= empty-cmd1.0
+${PACKAGE}FILES+= for1.0
+${PACKAGE}FILES+= for2.0
+${PACKAGE}FILES+= func1.0
+${PACKAGE}FILES+= func2.0
+${PACKAGE}FILES+= func3.0
+${PACKAGE}FILES+= heredoc1.0
+${PACKAGE}FILES+= heredoc2.0
+${PACKAGE}FILES+= heredoc3.0
+${PACKAGE}FILES+= heredoc4.0
+${PACKAGE}FILES+= heredoc5.0
+${PACKAGE}FILES+= heredoc6.0
+${PACKAGE}FILES+= heredoc7.0
+${PACKAGE}FILES+= heredoc8.0
+${PACKAGE}FILES+= heredoc9.0
+${PACKAGE}FILES+= heredoc10.0
+${PACKAGE}FILES+= heredoc11.0
+${PACKAGE}FILES+= heredoc12.0
+${PACKAGE}FILES+= heredoc13.0
+${PACKAGE}FILES+= line-cont1.0
+${PACKAGE}FILES+= line-cont2.0
+${PACKAGE}FILES+= line-cont3.0
+${PACKAGE}FILES+= line-cont4.0
+${PACKAGE}FILES+= line-cont5.0
+${PACKAGE}FILES+= line-cont6.0
+${PACKAGE}FILES+= line-cont7.0
+${PACKAGE}FILES+= line-cont8.0
+${PACKAGE}FILES+= line-cont9.0
+${PACKAGE}FILES+= line-cont10.0
+${PACKAGE}FILES+= line-cont11.0
+${PACKAGE}FILES+= no-space1.0
+${PACKAGE}FILES+= no-space2.0
+${PACKAGE}FILES+= nul1.0
+${PACKAGE}FILES+= only-redir1.0
+${PACKAGE}FILES+= only-redir2.0
+${PACKAGE}FILES+= only-redir3.0
+${PACKAGE}FILES+= only-redir4.0
+${PACKAGE}FILES+= pipe-not1.0
+${PACKAGE}FILES+= set-v1.0 set-v1.0.stderr
+${PACKAGE}FILES+= var-assign1.0
.include <bsd.test.mk>
diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile
index 3d7481dc643e..211fc95d326a 100644
--- a/bin/sh/tests/set-e/Makefile
+++ b/bin/sh/tests/set-e/Makefile
@@ -1,49 +1,46 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T}
.PATH: ${.CURDIR:H}
ATF_TESTS_SH= functional_test
-FILESDIR= ${TESTSDIR}
-
-FILES= and1.0
-FILES+= and2.1
-FILES+= and3.0
-FILES+= and4.0
-FILES+= background1.0
-FILES+= cmd1.0
-FILES+= cmd2.1
-FILES+= elif1.0
-FILES+= elif2.0
-FILES+= eval1.0
-FILES+= eval2.1
-FILES+= for1.0
-FILES+= func1.0
-FILES+= func2.1
-FILES+= if1.0
-FILES+= if2.0
-FILES+= if3.0
-FILES+= not1.0
-FILES+= not2.0
-FILES+= or1.0
-FILES+= or2.0
-FILES+= or3.1
-FILES+= pipe1.1
-FILES+= pipe2.0
-FILES+= return1.0
-FILES+= semi1.1
-FILES+= semi2.1
-FILES+= subshell1.0
-FILES+= subshell2.1
-FILES+= until1.0
-FILES+= until2.0
-FILES+= until3.0
-FILES+= while1.0
-FILES+= while2.0
-FILES+= while3.0
+${PACKAGE}FILES+= and1.0
+${PACKAGE}FILES+= and2.1
+${PACKAGE}FILES+= and3.0
+${PACKAGE}FILES+= and4.0
+${PACKAGE}FILES+= background1.0
+${PACKAGE}FILES+= cmd1.0
+${PACKAGE}FILES+= cmd2.1
+${PACKAGE}FILES+= elif1.0
+${PACKAGE}FILES+= elif2.0
+${PACKAGE}FILES+= eval1.0
+${PACKAGE}FILES+= eval2.1
+${PACKAGE}FILES+= for1.0
+${PACKAGE}FILES+= func1.0
+${PACKAGE}FILES+= func2.1
+${PACKAGE}FILES+= if1.0
+${PACKAGE}FILES+= if2.0
+${PACKAGE}FILES+= if3.0
+${PACKAGE}FILES+= not1.0
+${PACKAGE}FILES+= not2.0
+${PACKAGE}FILES+= or1.0
+${PACKAGE}FILES+= or2.0
+${PACKAGE}FILES+= or3.1
+${PACKAGE}FILES+= pipe1.1
+${PACKAGE}FILES+= pipe2.0
+${PACKAGE}FILES+= return1.0
+${PACKAGE}FILES+= semi1.1
+${PACKAGE}FILES+= semi2.1
+${PACKAGE}FILES+= subshell1.0
+${PACKAGE}FILES+= subshell2.1
+${PACKAGE}FILES+= until1.0
+${PACKAGE}FILES+= until2.0
+${PACKAGE}FILES+= until3.0
+${PACKAGE}FILES+= while1.0
+${PACKAGE}FILES+= while2.0
+${PACKAGE}FILES+= while3.0
.include <bsd.test.mk>
diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile
index 615d80a95cfc..6fc95f39ccb1 100644
--- a/bin/sleep/tests/Makefile
+++ b/bin/sleep/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= sleep_test
.include <bsd.test.mk>
diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile
index aff93d83aaf7..a1a5d4f02fa7 100644
--- a/bin/test/tests/Makefile
+++ b/bin/test/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= legacy_test
# Some tests in here are silently not run when the tests are executed as
# root. Explicitly tell Kyua to drop privileges.
diff --git a/bin/tests/Makefile b/bin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/bin/tests/Makefile
+++ b/bin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/cddl/lib/tests/Makefile
+++ b/cddl/lib/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/cddl/sbin/tests/Makefile
+++ b/cddl/sbin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/cddl/tests/Makefile
+++ b/cddl/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/cddl/usr.bin/tests/Makefile
+++ b/cddl/usr.bin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile
index 7db6f2fc0f76..ba5a7365840e 100644
--- a/cddl/usr.sbin/dtrace/tests/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/Makefile
@@ -5,7 +5,7 @@
TESTS_SUBDIRS+= common
.PATH: ${SRCTOP}/tests
-KYUAFILE= YES
+KYUAFILE= yes
.PATH: ${.CURDIR}/tools
SCRIPTSDIR= ${TESTSDIR}
diff --git a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
index 24581921ad98..02201577bacb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_AGG_FUNC.bad.d \
err.D_AGG_MDIM.bad.d \
err.D_AGG_NULL.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
index f8f74f294b21..2abee2f8598e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DIV_ZERO.divby0.d \
err.D_DIV_ZERO.divby0_1.d \
err.D_DIV_ZERO.divby0_2.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
index 0e1cfe15d139..abbc48322795 100644
--- a/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/arrays/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ARR_BADREF.bad.d \
err.D_DECL_ARRBIG.toobig.d \
err.D_DECL_ARRNULL.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
index 800dd88349b8..d7e64b8e4501 100644
--- a/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/assocs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_OP_INCOMPAT.dupgtype.d \
err.D_OP_INCOMPAT.dupttype.d \
err.D_OP_INCOMPAT.this.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
index 1572a84c15c8..1c254bfe2958 100644
--- a/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/begin/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.begin.d \
err.D_PDESC_ZERO.tick.d \
tst.begin.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
index 39c199b72f28..903e19262f73 100644
--- a/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ADDROF_BITFIELD.BitfieldAddress.d \
err.D_DECL_BFCONST.NegBitField.d \
err.D_DECL_BFCONST.ZeroBitField.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
index f5b09bf8ed43..e9680e57088c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/buffering/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.end.d \
err.resize1.d \
err.resize2.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
index a36757213e92..962e8c9bddb8 100644
--- a/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_XLATE_NOCONV.cpuusage.d \
err.D_XLATE_NOCONV.nice.d \
err.D_XLATE_NOCONV.priority.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
index c6c255195c43..e98af5191aea 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cg/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_NOREG.noreg.d \
err.baddif.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
index ff6d01c01147..0e835239c35d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/clauses/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_IDENT_UNDEF.aggfun.d \
err.D_IDENT_UNDEF.aggtup.d \
err.D_IDENT_UNDEF.arrtup.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
index c86b69afae28..7b8e85d904e7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/cpc/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.lowfrequency.d \
err.D_PDESC_ZERO.malformedoverflow.d \
err.D_PDESC_ZERO.nonexistentevent.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
index ea5950f50fbe..bd3bf7716feb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/decls/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DECL_LOCASSC.NonLocalAssoc.d \
err.D_DECL_LONGINT.LongStruct.d \
err.D_DECL_PARMCLASS.BadStorageClass.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
index 3e6ca3d46bde..5ca7d0908fd7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
badptr.d \
countdown.d \
counter.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
index 10b1eb5b9999..4f1973c69b26 100644
--- a/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/drops/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
drp.DTRACEDROP_AGGREGATION.d \
drp.DTRACEDROP_DBLERROR.d \
drp.DTRACEDROP_DYNAMIC.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
index 1ce004b8f708..dc77d8f0bc04 100644
--- a/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.InvalidDescription1.d \
man.APIVersion.d \
man.AddSearchPath.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/end/Makefile b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
index 951fed32a066..a05361ec4a39 100644
--- a/cddl/usr.sbin/dtrace/tests/common/end/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/end/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_IDENT_UNDEF.timespent.d \
tst.end.d \
tst.endwithoutbegin.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
index 340858649dc9..9b78801d4c2f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/enum/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DECL_IDRED.EnumSameName.d \
err.D_UNKNOWN.RepeatIdentifiers.d \
tst.EnumEquality.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/error/Makefile b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
index e2f8bf90d12f..afd93dd222ee 100644
--- a/cddl/usr.sbin/dtrace/tests/common/error/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/error/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.DTRACEFLT_BADADDR.d \
tst.DTRACEFLT_DIVZERO.d \
tst.DTRACEFLT_UNKNOWN.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
index 1129e0e6d5f2..3732caa83335 100644
--- a/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/exit/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PROTO_LEN.noarg.d \
err.exitarg1.d \
tst.basic1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
index 9097defa59a8..c773b78ba795 100644
--- a/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.notreturn.d \
tst.basic.d \
tst.functionentry.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
index b5a303542c2f..67d0b3cc4928 100644
--- a/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/funcs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_FUNC_UNDEF.progenyofbad1.d \
err.D_OP_VFPTR.badop.d \
err.D_PROTO_ARG.chillbadarg.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
index af5b19baaa0e..b9b94f2c6b35 100644
--- a/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/grammar/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ADDROF_LVAL.d \
err.D_EMPTY.empty.d \
tst.clauses.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/include/Makefile b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
index a081ac11b1a5..d84f25bef30d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/include/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/include/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.includefirst.ksh \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
index db5fa63d0c9c..3a30b97d3cb6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/inline/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DECL_IDRED.redef1.d \
err.D_DECL_IDRED.redef2.d \
err.D_IDENT_UNDEF.recur.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/io/Makefile b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
index 15a37f184a75..9075358230c4 100644
--- a/cddl/usr.sbin/dtrace/tests/common/io/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/io/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.fds.d \
tst.fds.d.out \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
index 0aa648b58e71..805c31f6cde4 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ip/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.ipv4localicmp.ksh \
tst.ipv4localicmp.ksh.out \
tst.ipv4localtcp.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
index 67789020d286..7c7fdef9c008 100644
--- a/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/java_api/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.Abort.ksh \
tst.Abort.ksh.out \
tst.Bean.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/json/Makefile b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
index b380f0f195a8..24400027c1e4 100644
--- a/cddl/usr.sbin/dtrace/tests/common/json/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/json/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.general.d \
tst.general.d.out \
tst.strsize.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
index 583249373c41..d53872a0361b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/lexer/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_CHR_NL.char.d \
err.D_CHR_NULL.char.d \
err.D_INT_DIGIT.InvalidDigit.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
index cf9bbc9bebdc..be71bec5159e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_LLQUANT_FACTOREVEN.nodivide.d \
err.D_LLQUANT_FACTOREVEN.notfactor.d \
err.D_LLQUANT_FACTORMATCH.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
index 8102c7b8a0fa..26c26e7ba558 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mdb/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.dtracedcmd.ksh \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
index 862ddfc72533..ed799e68a879 100644
--- a/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/mib/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.icmp.ksh \
tst.tcp.ksh \
tst.udp.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
index 2e2e01759e33..87084ab5d593 100644
--- a/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/misc/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRAGMA_OPTSET.d \
tst.badopt.d \
tst.boolopt.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
index 22ae12ae5503..2c0c4263a909 100644
--- a/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRINTA_AGGKEY.d \
err.D_PRINTA_AGGPROTO.d \
tst.many.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
index 4c765834ee9e..b50285991374 100644
--- a/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/nfs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.call.d \
tst.call3.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
index 204742fb73d1..2f56b12a035c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_OFFSETOF_BITFIELD.bitfield.d \
err.D_OFFSETOF_TYPE.badtype.d \
err.D_OFFSETOF_TYPE.notsou.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
index 08fdf2666ad3..daf530b93b62 100644
--- a/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/operators/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.ternary.d \
tst.ternary.d.out \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
index 5228ae3d08ed..0b9fdeb8bb6e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pid/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.badlib.d \
err.D_PDESC_ZERO.badproc1.d \
err.D_PROC_BADPID.badproc2.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
index a37635894ad7..57e30ed99036 100644
--- a/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.available.d \
tst.libmap.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
index 37e13831897d..af438aaaac2c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pointers/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.BadAlign.d \
err.D_ADDROF_VAR.ArrayVar.d \
err.D_ADDROF_VAR.DynamicVar.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
index a595111c57e9..26b6920d0b0c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/pragma/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRAGERR.d \
err.D_PRAGMA_DEPEND.main.d \
err.D_PRAGMA_INVAL.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
index 267f4173a0cf..bd14b43757f6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/predicates/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRED_SCALAR.NonScalarPred.d \
err.D_SYNTAX.invalid.d \
err.D_SYNTAX.operr.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
index 3685edfff0ed..f8b8917be205 100644
--- a/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_IDENT_UNDEF.afterprobe.d \
err.D_PRAGCTL_INVAL.tabdefine.d \
err.D_SYNTAX.withoutpound.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/print/Makefile b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
index 60d80ad73b43..af4e20e30557 100644
--- a/cddl/usr.sbin/dtrace/tests/common/print/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/print/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRINT_AGG.bad.d \
err.D_PRINT_VOID.bad.d \
err.D_PROTO_LEN.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
index 2404aa9975ac..8f5ac3613dcb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printa/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRINTA_AGGARG.badagg.d \
err.D_PRINTA_AGGARG.badfmt.d \
err.D_PRINTA_AGGARG.badval.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
index bda4ecf8a140..86cfdbbd5d9b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/printf/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PRINTF_AGG_CONV.aggfmt.d \
err.D_PRINTF_ARG_EXTRA.toomany.d \
err.D_PRINTF_ARG_EXTRA.widths.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
index 858c53ddaf25..36f6106f8f96 100644
--- a/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/privs/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.fds.ksh \
tst.func_access.ksh \
tst.getf.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
index 219973a0f8ac..8b8d779fe87e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.probeqtn.d \
err.D_PDESC_ZERO.probestar.d \
err.D_PDESC_ZERO.tickstar.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
index d5653645b020..5ca083fc9431 100644
--- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.create.ksh \
tst.discard.ksh \
tst.exec.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
index 5065fe359cac..4e5a0157ecff 100644
--- a/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.profile.d \
err.D_PDESC_ZEROonens.d \
err.D_PDESC_ZEROonensec.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
index 650818cf6351..3972831ba5d5 100644
--- a/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/providers/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_INVAL.wrongdec4.d \
err.D_PDESC_ZERO.nonprofile.d \
err.D_PDESC_ZERO.wrongdec1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
index 291419969359..cde512f2d21f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/raise/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.raise1.d \
tst.raise2.d \
tst.raise3.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
index 6371e74a7932..bc9ab0a9d446 100644
--- a/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/rates/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.aggrate.d \
tst.aggrate.d.out \
tst.statusrate.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
index 1760f82dcc71..53260533b641 100644
--- a/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/safety/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.basename.d \
tst.caller.d \
tst.cleanpath.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
index ece7045d8982..8a08eac05375 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scalars/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ARR_LOCAL.thisarray.d \
err.D_DECL_CLASS.selfthis.d \
err.D_DECL_CLASS.thisself.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
index 5cdca4e910ba..d1bf42553346 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sched/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.enqueue.d \
tst.oncpu.d \
tst.stackdepth.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
index 9e52a5dfae28..1562629423ea 100644
--- a/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/scripting/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_MACRO_UNDEF.invalidargs.d \
err.D_OP_LVAL.rdonly.d \
err.D_OP_WRITE.usepidmacro.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
index c52c9c9c76fd..ad0a43e4047e 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sdt/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.sdtargs.d \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
index df0d68b04048..021d0099b213 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_IDENT_BADREF.SizeofAssoc.d \
err.D_IDENT_UNDEF.UnknownSymbol.d \
err.D_SIZEOF_TYPE.badstruct.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
index c7193c2334e8..b5f6ae079e21 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
bug.1001148.SpecSizeVariations.d \
err.BufSizeVariations1.d \
err.BufSizeVariations2.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
index 939bf6559f0f..826202d4de3f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stability/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ATTR_MIN.MinAttributes.d \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
index 5a01e94c3013..2fc1e8164dc6 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stack/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_STACK_PROTO.bad.d \
err.D_STACK_SIZE.d \
err.D_USTACK_FRAMES.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
index 4b8f342af41a..e7beb43fa827 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.default.d \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
index 56fa9dab1a64..50a44bbd0a98 100644
--- a/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/stop/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.stop1.d \
tst.stop2.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
index af1e7d05e392..19937d3055eb 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strlen/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.strlen1.d \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
index e614138e059b..0ccc037d8bf3 100644
--- a/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.BaseTooLarge.d \
err.BaseTooSmall.d \
tst.strtoll.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
index 0b3ce40db6c6..35dd51a8067c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/struct/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ADDROF_VAR.StructPointer.d \
err.D_DECL_COMBO.StructWithoutColon.d \
err.D_DECL_COMBO.StructWithoutColon1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
index 795aeeb7eb36..f759b6bd398f 100644
--- a/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/syscall/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.args.d \
tst.openret.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
index 1d612c53b0bf..d87b2bbaf042 100644
--- a/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.post.d \
tst.post_chan.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
index af494f9ce850..1800635351d7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PDESC_ZERO.tick.d \
err.D_PDESC_ZEROonens.d \
err.D_PDESC_ZEROonensec.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
index 6f5e12ea1bee..19ff8e44230b 100644
--- a/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/trace/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PROTO_LEN.bad.d \
err.D_TRACE_AGG.bad.d \
err.D_TRACE_VOID.bad.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
index 67afa8491329..29b0ea26e691 100644
--- a/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_PROTO_ARG.badsize.d \
err.D_PROTO_LEN.toofew.d \
err.D_TRACEMEM_ADDR.badaddr.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
index 3722bf77b09a..6d38d1d63e36 100644
--- a/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/translators/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DECL_TYPERED.BadTransDecl.d \
err.D_OP_INCOMPLETE.NonExistentInput1.d \
err.D_SYNTAX.BadTransDecl1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
index dbc1f526bcbc..d3edcfd071ed 100644
--- a/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/typedef/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_DECL_IDRED.DupTypeDef.d \
err.D_SYNTAX.BadExistingTypedef.d \
err.D_SYNTAX.TypedefInClause.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/types/Makefile b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
index 7c65283194fc..89c2947f2632 100644
--- a/cddl/usr.sbin/dtrace/tests/common/types/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/types/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_CAST_INVAL.badcast.d \
err.D_CG_DYN.ResultDynType.d \
err.D_CHR_OFLOW.charconst.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
index 2746072bfb98..945a853b69df 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.invalidpid.d \
err.invalidpid2.d \
err.invalidpid3.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/union/Makefile b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
index bf3a28303cab..855869f05f04 100644
--- a/cddl/usr.sbin/dtrace/tests/common/union/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/union/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
err.D_ADDROF_VAR.UnionPointer.d \
err.D_DECL_COMBO.UnionWithoutColon.d \
err.D_DECL_COMBO.UnionWithoutColon1.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
index b4f66239acd4..dd5571980d1d 100644
--- a/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
argmap.d \
args.d \
forker.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
index 5acdf6d78ea3..6ea0621a0c29 100644
--- a/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/ustack/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.bigstack.d \
tst.depth.ksh \
tst.spin.ksh \
diff --git a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
index a08a3ceafda3..bced0bf6da53 100644
--- a/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/vars/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.gid.d \
tst.nullassign.d \
tst.ppid.d \
diff --git a/cddl/usr.sbin/dtrace/tests/common/version/Makefile b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
index 6c9da25a5127..3f1589f4249c 100644
--- a/cddl/usr.sbin/dtrace/tests/common/version/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/version/Makefile
@@ -4,7 +4,9 @@
# This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh.
#
-TESTFILES= \
+PACKAGE= tests
+
+${PACKAGE}FILES= \
tst.1.0.d \
TESTEXES= \
diff --git a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
index 0c528eff5896..d49a503809f2 100644
--- a/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
+++ b/cddl/usr.sbin/dtrace/tests/dtrace.test.mk
@@ -1,14 +1,14 @@
# $FreeBSD$
TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T}
-TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
+TESTSRC= ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP}
TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP}
-FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE
+FILESGROUPS+= ${TESTGROUP}EXE
-${TESTGROUP}= ${TESTFILES}
${TESTGROUP}EXE= ${TESTEXES}
${TESTGROUP}EXEMODE= 0555
+${TESTGROUP}EXEPACKAGE= ${PACKAGE}
TESTWRAPPER= t_dtrace_contrib
ATF_TESTS_SH+= ${TESTWRAPPER}
@@ -17,7 +17,7 @@ TEST_METADATA.t_dtrace_contrib+= required_user="root"
GENTEST?= ${.CURDIR:H:H}/tools/gentest.sh
EXCLUDE= ${.CURDIR:H:H}/tools/exclude.sh
-${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${TESTGROUP}}
+${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} ${${PACKAGE}FILES}
sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET}
CLEANFILES+= ${TESTWRAPPER}.sh
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
index fda81fbc4d88..9953064bcd3e 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -52,7 +52,9 @@ WITH_CTF=YES
# This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh.
#
-TESTFILES= \\
+PACKAGE= tests
+
+\${PACKAGE}FILES= \\
$tfiles
TESTEXES= \\
diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/cddl/usr.sbin/tests/Makefile
+++ b/cddl/usr.sbin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/gnu/lib/tests/Makefile
+++ b/gnu/lib/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/gnu/tests/Makefile
+++ b/gnu/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/gnu/usr.bin/diff/tests/Makefile b/gnu/usr.bin/diff/tests/Makefile
index 0b4ca2e157de..ffe31a6851e3 100644
--- a/gnu/usr.bin/diff/tests/Makefile
+++ b/gnu/usr.bin/diff/tests/Makefile
@@ -1,17 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff
NETBSD_ATF_TESTS_SH= diff_test
ATF_TESTS_SH_SED_diff_test= -e 's/t_diff/`basename $$0`/g'
-FILESDIR= ${TESTSDIR}
-FILES+= d_mallocv1.in
-FILES+= d_mallocv2.in
+${PACKAGE}FILES+= d_mallocv1.in
+${PACKAGE}FILES+= d_mallocv2.in
.include <netbsd-tests.test.mk>
diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/gnu/usr.bin/tests/Makefile
+++ b/gnu/usr.bin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index bebc7efc8175..0e0e455e458d 100644
--- a/lib/atf/libatf-c++/tests/Makefile
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.init.mk>
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+PACKAGE= tests
TESTS_SUBDIRS= detail
@@ -16,9 +14,8 @@ CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"'
CFLAGS+= -I${ATF}
-FILESDIR= ${TESTSDIR}
-FILES= macros_hpp_test.cpp
-FILES+= unused_test.cpp
+${PACKAGE}FILES+= macros_hpp_test.cpp
+${PACKAGE}FILES+= unused_test.cpp
.for _T in atf_c++_test \
build_test \
diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile
index f194abf9041d..f7d672e792fb 100644
--- a/lib/atf/libatf-c++/tests/detail/Makefile
+++ b/lib/atf/libatf-c++/tests/detail/Makefile
@@ -2,9 +2,6 @@
.include <bsd.init.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail
ATF= ${SRCTOP}/contrib/atf
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
index 82d6db427110..9b4e1299228f 100644
--- a/lib/atf/libatf-c/tests/Makefile
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -3,8 +3,6 @@
.include <bsd.init.mk>
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTS_SUBDIRS= detail
@@ -20,9 +18,8 @@ CFLAGS+= -I${ATF}
# TODO(jmmv): Remove this workaround once we do that update.
CFLAGS.clang+= -Wno-duplicate-decl-specifier
-FILESDIR= ${TESTSDIR}
-FILES= macros_h_test.c
-FILES+= unused_test.c
+${PACKAGE}FILES+= macros_h_test.c
+${PACKAGE}FILES+= unused_test.c
.for _T in atf_c_test \
build_test \
diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile
index 13f3819d1452..e47fd566ec01 100644
--- a/lib/atf/libatf-c/tests/detail/Makefile
+++ b/lib/atf/libatf-c/tests/detail/Makefile
@@ -2,12 +2,6 @@
.include <bsd.init.mk>
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail
ATF= ${SRCTOP}/contrib/atf
diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile
index 44ed72876fb9..61f839a55ca1 100644
--- a/lib/atf/tests/Makefile
+++ b/lib/atf/tests/Makefile
@@ -1,15 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTSDIR= ${TESTSBASE}/lib/atf
-TESTS+= Kyuafile
-
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile
index 4d756cf6dfa2..113a387c2979 100644
--- a/lib/atf/tests/test-programs/Makefile
+++ b/lib/atf/tests/test-programs/Makefile
@@ -2,12 +2,8 @@
.include <bsd.init.mk>
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/lib/atf/test-programs
-TESTS+= Kyuafile
+
KYUAFILE= yes
ATF= ${SRCTOP}/contrib/atf
diff --git a/lib/libarchive/tests/Makefile b/lib/libarchive/tests/Makefile
index 160ebb4f9499..3e05c64af9ee 100644
--- a/lib/libarchive/tests/Makefile
+++ b/lib/libarchive/tests/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
@@ -263,195 +261,195 @@ list.h: ${TESTS_SRCS} Makefile
egrep -v '${BROKEN_TESTS:tW:C/ /|/g}') > ${.TARGET}.tmp
@mv ${.TARGET}.tmp ${.TARGET}
-CLEANFILES+= list.h list.h.tmp
+CLEANTESTS+= list.h list.h.tmp
-FILES+= README
-FILES+= test_acl_pax.tar.uu
-FILES+= test_archive_string_conversion.txt.Z.uu
-FILES+= test_compat_bzip2_1.tbz.uu
-FILES+= test_compat_bzip2_2.tbz.uu
-FILES+= test_compat_cpio_1.cpio.uu
-FILES+= test_compat_gtar_1.tar.uu
-FILES+= test_compat_gzip_1.tgz.uu
-FILES+= test_compat_gzip_2.tgz.uu
-FILES+= test_compat_lzip_1.tlz.uu
-FILES+= test_compat_lzip_2.tlz.uu
-FILES+= test_compat_lzma_1.tlz.uu
-FILES+= test_compat_lzma_2.tlz.uu
-FILES+= test_compat_lzma_3.tlz.uu
-FILES+= test_compat_lzop_1.tar.lzo.uu
-FILES+= test_compat_lzop_2.tar.lzo.uu
-FILES+= test_compat_lzop_3.tar.lzo.uu
-FILES+= test_compat_mac-1.tar.Z.uu
-FILES+= test_compat_mac-2.tar.Z.uu
-FILES+= test_compat_pax_libarchive_2x.tar.Z.uu
-FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu
-FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu
-FILES+= test_compat_solaris_tar_acl.tar.uu
-FILES+= test_compat_tar_hardlink_1.tar.uu
-FILES+= test_compat_xz_1.txz.uu
-FILES+= test_compat_zip_1.zip.uu
-FILES+= test_compat_zip_2.zip.uu
-FILES+= test_compat_zip_3.zip.uu
-FILES+= test_compat_zip_4.zip.uu
-FILES+= test_compat_zip_5.zip.uu
-FILES+= test_compat_zip_6.zip.uu
-FILES+= test_compat_zip_7.xps.uu
-FILES+= test_fuzz.cab.uu
-FILES+= test_fuzz.lzh.uu
-FILES+= test_fuzz_1.iso.Z.uu
-FILES+= test_pax_filename_encoding.tar.uu
-FILES+= test_rar_multivolume_multiple_files.part1.rar.uu
-FILES+= test_rar_multivolume_multiple_files.part2.rar.uu
-FILES+= test_rar_multivolume_multiple_files.part3.rar.uu
-FILES+= test_rar_multivolume_multiple_files.part4.rar.uu
-FILES+= test_rar_multivolume_multiple_files.part5.rar.uu
-FILES+= test_rar_multivolume_multiple_files.part6.rar.uu
-FILES+= test_rar_multivolume_single_file.part1.rar.uu
-FILES+= test_rar_multivolume_single_file.part2.rar.uu
-FILES+= test_rar_multivolume_single_file.part3.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu
-FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu
-FILES+= test_read_filter_grzip.tar.grz.uu
-FILES+= test_read_filter_lrzip.tar.lrz.uu
-FILES+= test_read_filter_lzop.tar.lzo.uu
-FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu
-FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu
-FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu
-FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu
-FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu
-FILES+= test_read_format_7zip_bcj2_deflate.7z.uu
-FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu
-FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu
-FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu
-FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu
-FILES+= test_read_format_7zip_bcj_bzip2.7z.uu
-FILES+= test_read_format_7zip_bcj_copy.7z.uu
-FILES+= test_read_format_7zip_bcj_deflate.7z.uu
-FILES+= test_read_format_7zip_bcj_lzma1.7z.uu
-FILES+= test_read_format_7zip_bcj_lzma2.7z.uu
-FILES+= test_read_format_7zip_bzip2.7z.uu
-FILES+= test_read_format_7zip_copy.7z.uu
-FILES+= test_read_format_7zip_copy_2.7z.uu
-FILES+= test_read_format_7zip_deflate.7z.uu
-FILES+= test_read_format_7zip_delta_lzma1.7z.uu
-FILES+= test_read_format_7zip_delta_lzma2.7z.uu
-FILES+= test_read_format_7zip_empty_archive.7z.uu
-FILES+= test_read_format_7zip_empty_file.7z.uu
-FILES+= test_read_format_7zip_lzma1.7z.uu
-FILES+= test_read_format_7zip_lzma1_2.7z.uu
-FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu
-FILES+= test_read_format_7zip_lzma2.7z.uu
-FILES+= test_read_format_7zip_ppmd.7z.uu
-FILES+= test_read_format_7zip_symbolic_name.7z.uu
-FILES+= test_read_format_ar.ar.uu
-FILES+= test_read_format_cab_1.cab.uu
-FILES+= test_read_format_cab_2.cab.uu
-FILES+= test_read_format_cab_3.cab.uu
-FILES+= test_read_format_cab_filename_cp932.cab.uu
-FILES+= test_read_format_cpio_bin_be.cpio.uu
-FILES+= test_read_format_cpio_filename_cp866.cpio.uu
-FILES+= test_read_format_cpio_filename_eucjp.cpio.uu
-FILES+= test_read_format_cpio_filename_koi8r.cpio.uu
-FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu
-FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu
-FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
-FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu
-FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu
-FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu
-FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu
-FILES+= test_read_format_gtar_sparse_1_13.tar.uu
-FILES+= test_read_format_gtar_sparse_1_17.tar.uu
-FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu
-FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu
-FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu
-FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
-FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu
-FILES+= test_read_format_iso.iso.Z.uu
-FILES+= test_read_format_iso_2.iso.Z.uu
-FILES+= test_read_format_iso_joliet.iso.Z.uu
-FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu
-FILES+= test_read_format_iso_joliet_long.iso.Z.uu
-FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu
-FILES+= test_read_format_iso_multi_extent.iso.Z.uu
-FILES+= test_read_format_iso_rockridge.iso.Z.uu
-FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu
-FILES+= test_read_format_iso_rockridge_new.iso.Z.uu
-FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu
-FILES+= test_read_format_iso_xorriso.iso.Z.uu
-FILES+= test_read_format_iso_zisofs.iso.Z.uu
-FILES+= test_read_format_lha_filename_cp932.lzh.uu
-FILES+= test_read_format_lha_header0.lzh.uu
-FILES+= test_read_format_lha_header1.lzh.uu
-FILES+= test_read_format_lha_header2.lzh.uu
-FILES+= test_read_format_lha_header3.lzh.uu
-FILES+= test_read_format_lha_lh0.lzh.uu
-FILES+= test_read_format_lha_lh6.lzh.uu
-FILES+= test_read_format_lha_lh7.lzh.uu
-FILES+= test_read_format_lha_withjunk.lzh.uu
-FILES+= test_read_format_mtree.mtree.uu
-FILES+= test_read_format_mtree_nomagic.mtree.uu
-FILES+= test_read_format_mtree_nomagic2.mtree.uu
-FILES+= test_read_format_mtree_nomagic3.mtree.uu
-FILES+= test_read_format_rar.rar.uu
-FILES+= test_read_format_rar_binary_data.rar.uu
-FILES+= test_read_format_rar_compress_best.rar.uu
-FILES+= test_read_format_rar_compress_normal.rar.uu
-FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu
-FILES+= test_read_format_rar_multivolume.part0001.rar.uu
-FILES+= test_read_format_rar_multivolume.part0002.rar.uu
-FILES+= test_read_format_rar_multivolume.part0003.rar.uu
-FILES+= test_read_format_rar_multivolume.part0004.rar.uu
-FILES+= test_read_format_rar_noeof.rar.uu
-FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu
-FILES+= test_read_format_rar_sfx.exe.uu
-FILES+= test_read_format_rar_subblock.rar.uu
-FILES+= test_read_format_rar_unicode.rar.uu
-FILES+= test_read_format_rar_windows.rar.uu
-FILES+= test_read_format_raw.data.Z.uu
-FILES+= test_read_format_raw.data.uu
-FILES+= test_read_format_tar_empty_filename.tar.uu
-FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu
-FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu
-FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu
-FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu
-FILES+= test_read_format_zip.zip.uu
-FILES+= test_read_format_zip_comment_stored_1.zip.uu
-FILES+= test_read_format_zip_comment_stored_2.zip.uu
-FILES+= test_read_format_zip_filename_cp866.zip.uu
-FILES+= test_read_format_zip_filename_cp932.zip.uu
-FILES+= test_read_format_zip_filename_koi8r.zip.uu
-FILES+= test_read_format_zip_filename_utf8_jp.zip.uu
-FILES+= test_read_format_zip_filename_utf8_ru.zip.uu
-FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu
-FILES+= test_read_format_zip_length_at_end.zip.uu
-FILES+= test_read_format_zip_mac_metadata.zip.uu
-FILES+= test_read_format_zip_sfx.uu
-FILES+= test_read_format_zip_symlink.zip.uu
-FILES+= test_read_format_zip_ux.zip.uu
-FILES+= test_read_large_splitted_rar_aa.uu
-FILES+= test_read_large_splitted_rar_ab.uu
-FILES+= test_read_large_splitted_rar_ac.uu
-FILES+= test_read_large_splitted_rar_ad.uu
-FILES+= test_read_large_splitted_rar_ae.uu
-FILES+= test_read_splitted_rar_aa.uu
-FILES+= test_read_splitted_rar_ab.uu
-FILES+= test_read_splitted_rar_ac.uu
-FILES+= test_read_splitted_rar_ad.uu
-FILES+= test_splitted_rar_seek_support_aa.uu
-FILES+= test_splitted_rar_seek_support_ab.uu
-FILES+= test_splitted_rar_seek_support_ac.uu
-FILES+= test_write_disk_appledouble.cpio.gz.uu
-FILES+= test_write_disk_hfs_compression.tgz.uu
-FILES+= test_write_disk_mac_metadata.tar.gz.uu
-FILES+= test_write_disk_no_hfs_compression.tgz.uu
+${PACKAGE}FILES+= README
+${PACKAGE}FILES+= test_acl_pax.tar.uu
+${PACKAGE}FILES+= test_archive_string_conversion.txt.Z.uu
+${PACKAGE}FILES+= test_compat_bzip2_1.tbz.uu
+${PACKAGE}FILES+= test_compat_bzip2_2.tbz.uu
+${PACKAGE}FILES+= test_compat_cpio_1.cpio.uu
+${PACKAGE}FILES+= test_compat_gtar_1.tar.uu
+${PACKAGE}FILES+= test_compat_gzip_1.tgz.uu
+${PACKAGE}FILES+= test_compat_gzip_2.tgz.uu
+${PACKAGE}FILES+= test_compat_lzip_1.tlz.uu
+${PACKAGE}FILES+= test_compat_lzip_2.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_1.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_2.tlz.uu
+${PACKAGE}FILES+= test_compat_lzma_3.tlz.uu
+${PACKAGE}FILES+= test_compat_lzop_1.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_lzop_2.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_lzop_3.tar.lzo.uu
+${PACKAGE}FILES+= test_compat_mac-1.tar.Z.uu
+${PACKAGE}FILES+= test_compat_mac-2.tar.Z.uu
+${PACKAGE}FILES+= test_compat_pax_libarchive_2x.tar.Z.uu
+${PACKAGE}FILES+= test_compat_solaris_pax_sparse_1.pax.Z.uu
+${PACKAGE}FILES+= test_compat_solaris_pax_sparse_2.pax.Z.uu
+${PACKAGE}FILES+= test_compat_solaris_tar_acl.tar.uu
+${PACKAGE}FILES+= test_compat_tar_hardlink_1.tar.uu
+${PACKAGE}FILES+= test_compat_xz_1.txz.uu
+${PACKAGE}FILES+= test_compat_zip_1.zip.uu
+${PACKAGE}FILES+= test_compat_zip_2.zip.uu
+${PACKAGE}FILES+= test_compat_zip_3.zip.uu
+${PACKAGE}FILES+= test_compat_zip_4.zip.uu
+${PACKAGE}FILES+= test_compat_zip_5.zip.uu
+${PACKAGE}FILES+= test_compat_zip_6.zip.uu
+${PACKAGE}FILES+= test_compat_zip_7.xps.uu
+${PACKAGE}FILES+= test_fuzz.cab.uu
+${PACKAGE}FILES+= test_fuzz.lzh.uu
+${PACKAGE}FILES+= test_fuzz_1.iso.Z.uu
+${PACKAGE}FILES+= test_pax_filename_encoding.tar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part1.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part2.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part3.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part4.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part5.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_multiple_files.part6.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part1.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part2.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_single_file.part3.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part01.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part02.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part03.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part04.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part05.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part06.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part07.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part08.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part09.rar.uu
+${PACKAGE}FILES+= test_rar_multivolume_uncompressed_files.part10.rar.uu
+${PACKAGE}FILES+= test_read_filter_grzip.tar.grz.uu
+${PACKAGE}FILES+= test_read_filter_lrzip.tar.lrz.uu
+${PACKAGE}FILES+= test_read_filter_lzop.tar.lzo.uu
+${PACKAGE}FILES+= test_read_filter_lzop_multiple_parts.tar.lzo.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_copy_lzma.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma1_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj2_lzma2_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_copy.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bcj_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_bzip2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_copy.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_copy_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_deflate.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_delta_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_empty_archive.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_empty_file.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1_2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma1_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_lzma2.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_ppmd.7z.uu
+${PACKAGE}FILES+= test_read_format_7zip_symbolic_name.7z.uu
+${PACKAGE}FILES+= test_read_format_ar.ar.uu
+${PACKAGE}FILES+= test_read_format_cab_1.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_2.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_3.cab.uu
+${PACKAGE}FILES+= test_read_format_cab_filename_cp932.cab.uu
+${PACKAGE}FILES+= test_read_format_cpio_bin_be.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_cp866.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_eucjp.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_koi8r.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_jp.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_filename_utf8_ru.cpio.uu
+${PACKAGE}FILES+= test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
+${PACKAGE}FILES+= test_read_format_cpio_svr4_gzip_rpm.rpm.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_cp866.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_eucjp.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_13.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix00.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix01.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
+${PACKAGE}FILES+= test_read_format_gtar_sparse_skip_entry.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_iso.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_2.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_by_nero.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_long.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_joliet_rockridge.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_multi_extent.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_ce.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_new.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_rockridge_rr_moved.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_xorriso.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_iso_zisofs.iso.Z.uu
+${PACKAGE}FILES+= test_read_format_lha_filename_cp932.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header0.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header1.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header2.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_header3.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh0.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh6.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_lh7.lzh.uu
+${PACKAGE}FILES+= test_read_format_lha_withjunk.lzh.uu
+${PACKAGE}FILES+= test_read_format_mtree.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic2.mtree.uu
+${PACKAGE}FILES+= test_read_format_mtree_nomagic3.mtree.uu
+${PACKAGE}FILES+= test_read_format_rar.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_binary_data.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_compress_best.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_compress_normal.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multi_lzss_blocks.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0001.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0002.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0003.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_multivolume.part0004.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_noeof.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_ppmd_lzss_conversion.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_sfx.exe.uu
+${PACKAGE}FILES+= test_read_format_rar_subblock.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_unicode.rar.uu
+${PACKAGE}FILES+= test_read_format_rar_windows.rar.uu
+${PACKAGE}FILES+= test_read_format_raw.data.Z.uu
+${PACKAGE}FILES+= test_read_format_raw.data.uu
+${PACKAGE}FILES+= test_read_format_tar_empty_filename.tar.uu
+${PACKAGE}FILES+= test_read_format_tar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_cp866.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_eucjp.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_ustar_filename_koi8r.tar.Z.uu
+${PACKAGE}FILES+= test_read_format_zip.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_comment_stored_1.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_comment_stored_2.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_cp866.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_cp932.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_koi8r.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_jp.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_filename_utf8_ru2.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_length_at_end.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_mac_metadata.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_sfx.uu
+${PACKAGE}FILES+= test_read_format_zip_symlink.zip.uu
+${PACKAGE}FILES+= test_read_format_zip_ux.zip.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_aa.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ab.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ac.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ad.uu
+${PACKAGE}FILES+= test_read_large_splitted_rar_ae.uu
+${PACKAGE}FILES+= test_read_splitted_rar_aa.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ab.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ac.uu
+${PACKAGE}FILES+= test_read_splitted_rar_ad.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_aa.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_ab.uu
+${PACKAGE}FILES+= test_splitted_rar_seek_support_ac.uu
+${PACKAGE}FILES+= test_write_disk_appledouble.cpio.gz.uu
+${PACKAGE}FILES+= test_write_disk_hfs_compression.tgz.uu
+${PACKAGE}FILES+= test_write_disk_mac_metadata.tar.gz.uu
+${PACKAGE}FILES+= test_write_disk_no_hfs_compression.tgz.uu
.include <bsd.test.mk>
diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile
index 8276422cc7f4..ff1af5514501 100644
--- a/lib/libc/tests/Makefile
+++ b/lib/libc/tests/Makefile
@@ -2,10 +2,6 @@
.include <src.opts.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
SUBDIR= tls_dso
TESTS_SUBDIRS= c063
diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile
index 779062881249..05da6ea212a9 100644
--- a/lib/libc/tests/c063/Makefile
+++ b/lib/libc/tests/c063/Makefile
@@ -2,10 +2,6 @@
#TODO: t_o_search
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= faccessat_test
NETBSD_ATF_TESTS_C+= fchmodat_test
NETBSD_ATF_TESTS_C+= fchownat_test
diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile
index ffe90d0b7a77..6c7ce96d99f8 100644
--- a/lib/libc/tests/db/Makefile
+++ b/lib/libc/tests/db/Makefile
@@ -1,16 +1,12 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
BINDIR= ${TESTSDIR}
PROGS= h_db
-FILESDIR= ${TESTSDIR}
-
-FILES= README
+${PACKAGE}FILES+= README
NETBSD_ATF_TESTS_SH+= db_test
ATF_TESTS_SH_SED_db_test= -e 's,/bin/csh,/bin/cat,g'
diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index b4e14d97151c..083097730cc0 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= arc4random_test
ATF_TESTS_C+= fmtcheck2_test
ATF_TESTS_C+= fmtmsg_test
diff --git a/lib/libc/tests/gen/execve/Makefile b/lib/libc/tests/gen/execve/Makefile
index a9800db5fcf9..5e8bc6fb7640 100644
--- a/lib/libc/tests/gen/execve/Makefile
+++ b/lib/libc/tests/gen/execve/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= execve_test
.include "../../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/gen/posix_spawn/Makefile b/lib/libc/tests/gen/posix_spawn/Makefile
index 659f73bad2c7..9b687c6d5fed 100644
--- a/lib/libc/tests/gen/posix_spawn/Makefile
+++ b/lib/libc/tests/gen/posix_spawn/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
BINDIR= ${TESTSDIR}
NETBSD_ATF_TESTS_C= fileactions_test
diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile
index 188ba7f1400e..313dff3055ca 100644
--- a/lib/libc/tests/hash/Makefile
+++ b/lib/libc/tests/hash/Makefile
@@ -1,10 +1,8 @@
# $FreeBSD$
-.include <src.opts.mk>
-
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
+.include <src.opts.mk>
NETBSD_ATF_TESTS_C=
@@ -18,13 +16,16 @@ BINDIR= ${TESTSDIR}
PROGS+= h_hash
-FILESDIR= ${TESTSDIR}/data
+FILESGROUPS+= ${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE= tests
+
+${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data
-FILES+= data/md5test-in
-FILES+= data/md5test-out
-FILES+= data/sha1test-in
-FILES+= data/sha1test-out
-FILES+= data/sha1test2-out
+${PACKAGE}DATA_FILES+= data/md5test-in
+${PACKAGE}DATA_FILES+= data/md5test-out
+${PACKAGE}DATA_FILES+= data/sha1test-in
+${PACKAGE}DATA_FILES+= data/sha1test-out
+${PACKAGE}DATA_FILES+= data/sha1test2-out
LIBADD+= md
LIBADD.sha2_test+= crypto
diff --git a/lib/libc/tests/inet/Makefile b/lib/libc/tests/inet/Makefile
index f06150834cb2..ee6f98e2f71f 100644
--- a/lib/libc/tests/inet/Makefile
+++ b/lib/libc/tests/inet/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= inet_network_test
.include "../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile
index 5a5954ac7db9..e05cbae3ac9f 100644
--- a/lib/libc/tests/locale/Makefile
+++ b/lib/libc/tests/locale/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= btowc_test
ATF_TESTS_C+= c16rtomb_test
ATF_TESTS_C+= iswctype_test
diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile
index 56710c150aa8..23def7e20c68 100644
--- a/lib/libc/tests/net/Makefile
+++ b/lib/libc/tests/net/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_C+= ether_test
ATF_TESTS_C+= eui64_aton_test
@@ -37,7 +35,7 @@ aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c
# TODO: the testcases needs to be ported to FreeBSD
#TESTS_SUBDIRS= getaddrinfo
-FILES+= hosts
-FILES+= resolv.conf
+${PACKAGE}FILES+= hosts
+${PACKAGE}FILES+= resolv.conf
.include <bsd.test.mk>
diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile
index d21d33655942..96b60d2a9792 100644
--- a/lib/libc/tests/net/getaddrinfo/Makefile
+++ b/lib/libc/tests/net/getaddrinfo/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+PACKAGE= tests
+
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
.include <bsd.own.mk>
@@ -12,15 +14,18 @@ NETBSD_ATF_TESTS_SH= getaddrinfo_test
PROGS= h_gai
-FILESDIR= ${TESTSDIR}/data
+FILESGROUPS+= ${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE= tests
+
+${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data
-FILES= basics_v4.exp basics_v4v6.exp
-FILES+= no_host_v4.exp no_host_v4v6.exp
-FILES+= no_serv_v4.exp no_serv_v4v6.exp
-FILES+= sock_raw_v4.exp sock_raw_v4v6.exp
-FILES+= spec_fam_v4.exp spec_fam_v4v6.exp
-FILES+= scoped.exp
-FILES+= unsup_fam.exp
+${PACKAGE}DATA_FILES+= basics_v4.exp basics_v4v6.exp
+${PACKAGE}DATA_FILES+= no_host_v4.exp no_host_v4v6.exp
+${PACKAGE}DATA_FILES+= no_serv_v4.exp no_serv_v4v6.exp
+${PACKAGE}DATA_FILES+= sock_raw_v4.exp sock_raw_v4v6.exp
+${PACKAGE}DATA_FILES+= spec_fam_v4.exp spec_fam_v4v6.exp
+${PACKAGE}DATA_FILES+= scoped.exp
+${PACKAGE}DATA_FILES+= unsup_fam.exp
.include "../../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/nss/Makefile b/lib/libc/tests/nss/Makefile
index da676a732e9e..79f13c5fae87 100644
--- a/lib/libc/tests/nss/Makefile
+++ b/lib/libc/tests/nss/Makefile
@@ -1,15 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/lib/libc/nss
BINDIR= ${TESTSDIR}
.PATH: ${.CURDIR:H}/resolv
-FILES+= mach
+${PACKAGE}FILES+= mach
CFLAGS+= -I${SRCTOP}/tests
diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile
index f60d512dc09b..c4f43512623d 100644
--- a/lib/libc/tests/regex/Makefile
+++ b/lib/libc/tests/regex/Makefile
@@ -3,8 +3,6 @@
.include <bsd.own.mk>
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
BINDIR= ${TESTSDIR}
@@ -16,35 +14,39 @@ SRCS.h_regex= main.c split.c debug.c
NETBSD_ATF_TESTS_SH= regex_test
-FILESDIR= ${TESTSDIR}/data
-FILES+= README
-FILES+= data/anchor.in
-FILES+= data/backref.in
-FILES+= data/basic.in
-FILES+= data/bracket.in
-FILES+= data/c_comments.in
-FILES+= data/complex.in
-FILES+= data/error.in
-FILES+= data/meta.in
-FILES+= data/nospec.in
-FILES+= data/paren.in
-FILES+= data/regress.in
-FILES+= data/repet_bounded.in
-FILES+= data/repet_multi.in
-FILES+= data/repet_ordinary.in
-FILES+= data/startend.in
-FILES+= data/subexp.in
-FILES+= data/subtle.in
-FILES+= data/word_bound.in
-FILES+= data/zero.in
-#FILES+= data/att/README
-FILES+= data/att/basic.dat
-FILES+= data/att/categorization.dat
-FILES+= data/att/forcedassoc.dat
-FILES+= data/att/leftassoc.dat
-FILES+= data/att/nullsubexpr.dat
-FILES+= data/att/repetition.dat
-FILES+= data/att/rightassoc.dat
+${PACKAGE}FILES+= README
+
+FILESGROUPS+= ${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE=${PACKAGE}
+
+${PACKAGE}DATA_FILESDIR= ${TESTSDIR}/data
+${PACKAGE}DATA_FILES+= data/anchor.in
+${PACKAGE}DATA_FILES+= data/backref.in
+${PACKAGE}DATA_FILES+= data/basic.in
+${PACKAGE}DATA_FILES+= data/bracket.in
+${PACKAGE}DATA_FILES+= data/c_comments.in
+${PACKAGE}DATA_FILES+= data/complex.in
+${PACKAGE}DATA_FILES+= data/error.in
+${PACKAGE}DATA_FILES+= data/meta.in
+${PACKAGE}DATA_FILES+= data/nospec.in
+${PACKAGE}DATA_FILES+= data/paren.in
+${PACKAGE}DATA_FILES+= data/regress.in
+${PACKAGE}DATA_FILES+= data/repet_bounded.in
+${PACKAGE}DATA_FILES+= data/repet_multi.in
+${PACKAGE}DATA_FILES+= data/repet_ordinary.in
+${PACKAGE}DATA_FILES+= data/startend.in
+${PACKAGE}DATA_FILES+= data/subexp.in
+${PACKAGE}DATA_FILES+= data/subtle.in
+${PACKAGE}DATA_FILES+= data/word_bound.in
+${PACKAGE}DATA_FILES+= data/zero.in
+#${PACKAGE}DATA_FILES+= data/att/README
+${PACKAGE}DATA_FILES+= data/att/basic.dat
+${PACKAGE}DATA_FILES+= data/att/categorization.dat
+${PACKAGE}DATA_FILES+= data/att/forcedassoc.dat
+${PACKAGE}DATA_FILES+= data/att/leftassoc.dat
+${PACKAGE}DATA_FILES+= data/att/nullsubexpr.dat
+${PACKAGE}DATA_FILES+= data/att/repetition.dat
+${PACKAGE}DATA_FILES+= data/att/rightassoc.dat
NETBSD_ATF_TESTS_C= exhaust_test
NETBSD_ATF_TESTS_C+= regex_att_test
diff --git a/lib/libc/tests/resolv/Makefile b/lib/libc/tests/resolv/Makefile
index cc17ef59afac..cb82da67c4f7 100644
--- a/lib/libc/tests/resolv/Makefile
+++ b/lib/libc/tests/resolv/Makefile
@@ -1,13 +1,10 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTSDIR= ${TESTSBASE}/lib/libc/resolv
-BINDIR= ${TESTSDIR}
+TESTSDIR= ${TESTSBASE}/lib/libc/resolv
-FILES+= mach
+${PACKAGE}FILES+= mach
ATF_TESTS_C+= resolv_test
diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile
index 6a6ae7b1c639..d7780ef4b86c 100644
--- a/lib/libc/tests/rpc/Makefile
+++ b/lib/libc/tests/rpc/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \
h_testbits.h
diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile
index b645b4d8eb07..39b0a96295f4 100644
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= setjmp_test
NETBSD_ATF_TESTS_C+= threadjmp_test
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index 11ccca9c0402..2ac74aafc775 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NO_WERROR=
WARNS?= 2
diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile
index 50484fd54b44..72685e078e72 100644
--- a/lib/libc/tests/stdio/Makefile
+++ b/lib/libc/tests/stdio/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= fdopen_test
ATF_TESTS_C+= fmemopen2_test
ATF_TESTS_C+= fopen2_test
diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index 08f34b0a0e28..87e84c5df51c 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= heapsort_test
ATF_TESTS_C+= mergesort_test
ATF_TESTS_C+= qsort_test
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index a8db9c33b760..ea2dfcff20f0 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= memcmp_test
ATF_TESTS_C+= stpncpy_test
ATF_TESTS_C+= strerror2_test
diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile
index e79204a38a6e..67112878206f 100644
--- a/lib/libc/tests/sys/Makefile
+++ b/lib/libc/tests/sys/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= queue_test
# TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
@@ -72,7 +68,7 @@ WARNS?= 3
WARNS?= 4
.endif
-FILESGROUPS+= FILES truncate_test_FILES
+FILESGROUPS+= truncate_test_FILES
truncate_test_FILES= truncate_test.root_owned
truncate_test_FILESDIR= ${TESTSDIR}
@@ -80,7 +76,6 @@ truncate_test_FILESMODE= 0600
truncate_test_FILESOWNER= root
truncate_test_FILESGRP= wheel
truncate_test_FILESPACKAGE= ${PACKAGE}
-FILESPACKAGE= ${PACKAGE}
CLEANFILES= truncate_test.root_owned
truncate_test.root_owned:
diff --git a/lib/libc/tests/termios/Makefile b/lib/libc/tests/termios/Makefile
index 81b0ff1d8ba6..0495d684b505 100644
--- a/lib/libc/tests/termios/Makefile
+++ b/lib/libc/tests/termios/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= tcsetpgrp_test
.include "../Makefile.netbsd-tests"
diff --git a/lib/libc/tests/time/Makefile b/lib/libc/tests/time/Makefile
index 49745e2331ec..feb543dad243 100644
--- a/lib/libc/tests/time/Makefile
+++ b/lib/libc/tests/time/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_C= mktime_test
NETBSD_ATF_TESTS_C+= strptime_test
diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile
index 0e98fed0ba18..cbf441d6e1b1 100644
--- a/lib/libc/tests/tls/Makefile
+++ b/lib/libc/tests/tls/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
.if !defined(NO_PIC)
SUBDIR+= dso
.endif
diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile
index 74f826aeaaf5..84225f4a1d0e 100644
--- a/lib/libc/tests/tls/dso/Makefile
+++ b/lib/libc/tests/tls/dso/Makefile
@@ -1,10 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
-OBJTOP= ${.OBJDIR:H:H:H:H:H}
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
LIB= h_tls_dlopen
diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile
index 79b05f89e3c9..5449799de96c 100644
--- a/lib/libc/tests/tls_dso/Makefile
+++ b/lib/libc/tests/tls_dso/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
LIB= h_tls_dynamic
SRCS= h_tls_dynamic.c
diff --git a/lib/libc/tests/ttyio/Makefile b/lib/libc/tests/ttyio/Makefile
index c9520fbdb318..d5b8f0168558 100644
--- a/lib/libc/tests/ttyio/Makefile
+++ b/lib/libc/tests/ttyio/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
# TODO: ptm_test
NETBSD_ATF_TESTS_C= ttyio_test
diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile
index 0c831ad6044a..15798b215d17 100644
--- a/lib/libcrypt/tests/Makefile
+++ b/lib/libcrypt/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= crypt_tests
NETBSD_ATF_TESTS_C+= crypt_test
diff --git a/lib/libmp/tests/Makefile b/lib/libmp/tests/Makefile
index 86f0985da34a..42749d00a039 100644
--- a/lib/libmp/tests/Makefile
+++ b/lib/libmp/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_C+= legacy_test
LIBADD+= mp
diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile
index d815af48b5cb..cce0b5e8f1a7 100644
--- a/lib/libnv/tests/Makefile
+++ b/lib/libnv/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_CXX= \
dnv_tests \
nv_array_tests \
diff --git a/lib/libpam/libpam/tests/Makefile b/lib/libpam/libpam/tests/Makefile
index ec32229781e2..e40936a883db 100644
--- a/lib/libpam/libpam/tests/Makefile
+++ b/lib/libpam/libpam/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/t
diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile
index 768078ecb3f8..d48250e3bb67 100644
--- a/lib/libproc/tests/Makefile
+++ b/lib/libproc/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C+= proc_test
PROGS= target_prog
diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile
index 7f788aef98e5..c4817ecfad76 100644
--- a/lib/librt/tests/Makefile
+++ b/lib/librt/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
LIBADD= rt
NETBSD_ATF_TESTS_C= sched_test
diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile
index 6c2139a5d5b3..159cc3b4d030 100644
--- a/lib/libthr/tests/Makefile
+++ b/lib/libthr/tests/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread
# TODO: t_name (missing pthread_getname_np support in FreeBSD)
@@ -44,8 +43,7 @@ PROGS+= h_cancel
PROGS+= h_exit
PROGS+= h_resolv
-FILESDIR= ${TESTSDIR}
-FILES= d_mach
+${PACKAGE}FILES+= d_mach
TESTS_SUBDIRS= dlopen
diff --git a/lib/libthr/tests/dlopen/Makefile b/lib/libthr/tests/dlopen/Makefile
index 1f587a5af73b..bea70ec7cbd5 100644
--- a/lib/libthr/tests/dlopen/Makefile
+++ b/lib/libthr/tests/dlopen/Makefile
@@ -4,9 +4,6 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen
CFLAGS+= -DTESTDIR=\"${TESTSDIR:Q}/\"
diff --git a/lib/libthr/tests/dlopen/dso/Makefile b/lib/libthr/tests/dlopen/dso/Makefile
index a7f685f5a917..b9a90310bf2b 100644
--- a/lib/libthr/tests/dlopen/dso/Makefile
+++ b/lib/libthr/tests/dlopen/dso/Makefile
@@ -1,10 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
-OBJTOP= ${.OBJDIR:H:H:H:H:H}
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso
SHLIB= h_pthread_dlopen
diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile
index 2f46850fd51a..81b2a494eaae 100644
--- a/lib/libutil/tests/Makefile
+++ b/lib/libutil/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_C+= flopen_test
TAP_TESTS_C+= grp_test
TAP_TESTS_C+= humanize_number_test
diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile
index de59ada7b7a6..20580edb329f 100644
--- a/lib/libxo/tests/Makefile
+++ b/lib/libxo/tests/Makefile
@@ -3,8 +3,6 @@
.include <bsd.own.mk>
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
LIBXOSRC= ${SRCTOP}/contrib/libxo
@@ -19,218 +17,216 @@ LIBXOSRC= ${SRCTOP}/contrib/libxo
.c.out .o.out:
-TESTSDIR= ${TESTSBASE}/lib/libxo
-
ATF_TESTS_SH+= functional_test
BINDIR= ${TESTSDIR}
-FILES+= test_01.E.err
-FILES+= test_01.E.out
-FILES+= test_01.H.err
-FILES+= test_01.H.out
-FILES+= test_01.HIPx.err
-FILES+= test_01.HIPx.out
-FILES+= test_01.HP.err
-FILES+= test_01.HP.out
-FILES+= test_01.J.err
-FILES+= test_01.J.out
-FILES+= test_01.JP.err
-FILES+= test_01.JP.out
-FILES+= test_01.T.err
-FILES+= test_01.T.out
-FILES+= test_01.X.err
-FILES+= test_01.X.out
-FILES+= test_01.XP.err
-FILES+= test_01.XP.out
-FILES+= test_01.err
-FILES+= test_01.out
-FILES+= test_02.E.err
-FILES+= test_02.E.out
-FILES+= test_02.H.err
-FILES+= test_02.H.out
-FILES+= test_02.HIPx.err
-FILES+= test_02.HIPx.out
-FILES+= test_02.HP.err
-FILES+= test_02.HP.out
-FILES+= test_02.J.err
-FILES+= test_02.J.out
-FILES+= test_02.JP.err
-FILES+= test_02.JP.out
-FILES+= test_02.T.err
-FILES+= test_02.T.out
-FILES+= test_02.X.err
-FILES+= test_02.X.out
-FILES+= test_02.XP.err
-FILES+= test_02.XP.out
-FILES+= test_02.err
-FILES+= test_02.out
-FILES+= test_03.E.err
-FILES+= test_03.E.out
-FILES+= test_03.H.err
-FILES+= test_03.H.out
-FILES+= test_03.HIPx.err
-FILES+= test_03.HIPx.out
-FILES+= test_03.HP.err
-FILES+= test_03.HP.out
-FILES+= test_03.J.err
-FILES+= test_03.J.out
-FILES+= test_03.JP.err
-FILES+= test_03.JP.out
-FILES+= test_03.T.err
-FILES+= test_03.T.out
-FILES+= test_03.X.err
-FILES+= test_03.X.out
-FILES+= test_03.XP.err
-FILES+= test_03.XP.out
-FILES+= test_03.err
-FILES+= test_03.out
-FILES+= test_04.E.err
-FILES+= test_04.E.out
-FILES+= test_04.H.err
-FILES+= test_04.H.out
-FILES+= test_04.HIPx.err
-FILES+= test_04.HIPx.out
-FILES+= test_04.HP.err
-FILES+= test_04.HP.out
-FILES+= test_04.J.err
-FILES+= test_04.J.out
-FILES+= test_04.JP.err
-FILES+= test_04.JP.out
-FILES+= test_04.T.err
-FILES+= test_04.T.out
-FILES+= test_04.X.err
-FILES+= test_04.X.out
-FILES+= test_04.XP.err
-FILES+= test_04.XP.out
-FILES+= test_05.E.err
-FILES+= test_05.E.out
-FILES+= test_05.H.err
-FILES+= test_05.H.out
-FILES+= test_05.HIPx.err
-FILES+= test_05.HIPx.out
-FILES+= test_05.HP.err
-FILES+= test_05.HP.out
-FILES+= test_05.J.err
-FILES+= test_05.J.out
-FILES+= test_05.JP.err
-FILES+= test_05.JP.out
-FILES+= test_05.T.err
-FILES+= test_05.T.out
-FILES+= test_05.X.err
-FILES+= test_05.X.out
-FILES+= test_05.XP.err
-FILES+= test_05.XP.out
-FILES+= test_06.E.err
-FILES+= test_06.E.out
-FILES+= test_06.H.err
-FILES+= test_06.H.out
-FILES+= test_06.HIPx.err
-FILES+= test_06.HIPx.out
-FILES+= test_06.HP.err
-FILES+= test_06.HP.out
-FILES+= test_06.J.err
-FILES+= test_06.J.out
-FILES+= test_06.JP.err
-FILES+= test_06.JP.out
-FILES+= test_06.T.err
-FILES+= test_06.T.out
-FILES+= test_06.X.err
-FILES+= test_06.X.out
-FILES+= test_06.XP.err
-FILES+= test_06.XP.out
-FILES+= test_07.E.err
-FILES+= test_07.E.out
-FILES+= test_07.H.err
-FILES+= test_07.H.out
-FILES+= test_07.HIPx.err
-FILES+= test_07.HIPx.out
-FILES+= test_07.HP.err
-FILES+= test_07.HP.out
-FILES+= test_07.J.err
-FILES+= test_07.J.out
-FILES+= test_07.JP.err
-FILES+= test_07.JP.out
-FILES+= test_07.T.err
-FILES+= test_07.T.out
-FILES+= test_07.X.err
-FILES+= test_07.X.out
-FILES+= test_07.XP.err
-FILES+= test_07.XP.out
-FILES+= test_08.E.err
-FILES+= test_08.E.out
-FILES+= test_08.H.err
-FILES+= test_08.H.out
-FILES+= test_08.HIPx.err
-FILES+= test_08.HIPx.out
-FILES+= test_08.HP.err
-FILES+= test_08.HP.out
-FILES+= test_08.J.err
-FILES+= test_08.J.out
-FILES+= test_08.JP.err
-FILES+= test_08.JP.out
-FILES+= test_08.T.err
-FILES+= test_08.T.out
-FILES+= test_08.X.err
-FILES+= test_08.X.out
-FILES+= test_08.XP.err
-FILES+= test_08.XP.out
-FILES+= test_09.E.err
-FILES+= test_09.E.out
-FILES+= test_09.H.err
-FILES+= test_09.H.out
-FILES+= test_09.HIPx.err
-FILES+= test_09.HIPx.out
-FILES+= test_09.HP.err
-FILES+= test_09.HP.out
-FILES+= test_09.J.err
-FILES+= test_09.J.out
-FILES+= test_09.JP.err
-FILES+= test_09.JP.out
-FILES+= test_09.T.err
-FILES+= test_09.T.out
-FILES+= test_09.X.err
-FILES+= test_09.X.out
-FILES+= test_09.XP.err
-FILES+= test_09.XP.out
-FILES+= test_10.E.err
-FILES+= test_10.E.out
-FILES+= test_10.H.err
-FILES+= test_10.H.out
-FILES+= test_10.HIPx.err
-FILES+= test_10.HIPx.out
-FILES+= test_10.HP.err
-FILES+= test_10.HP.out
-FILES+= test_10.J.err
-FILES+= test_10.J.out
-FILES+= test_10.JP.err
-FILES+= test_10.JP.out
-FILES+= test_10.T.err
-FILES+= test_10.T.out
-FILES+= test_10.X.err
-FILES+= test_10.X.out
-FILES+= test_10.XP.err
-FILES+= test_10.XP.out
-FILES+= test_10.err
-FILES+= test_10.out
-FILES+= test_11.E.err
-FILES+= test_11.E.out
-FILES+= test_11.H.err
-FILES+= test_11.H.out
-FILES+= test_11.HIPx.err
-FILES+= test_11.HIPx.out
-FILES+= test_11.HP.err
-FILES+= test_11.HP.out
-FILES+= test_11.J.err
-FILES+= test_11.J.out
-FILES+= test_11.JP.err
-FILES+= test_11.JP.out
-FILES+= test_11.T.err
-FILES+= test_11.T.out
-FILES+= test_11.X.err
-FILES+= test_11.X.out
-FILES+= test_11.XP.err
-FILES+= test_11.XP.out
+${PACKAGE}FILES+= test_01.E.err
+${PACKAGE}FILES+= test_01.E.out
+${PACKAGE}FILES+= test_01.H.err
+${PACKAGE}FILES+= test_01.H.out
+${PACKAGE}FILES+= test_01.HIPx.err
+${PACKAGE}FILES+= test_01.HIPx.out
+${PACKAGE}FILES+= test_01.HP.err
+${PACKAGE}FILES+= test_01.HP.out
+${PACKAGE}FILES+= test_01.J.err
+${PACKAGE}FILES+= test_01.J.out
+${PACKAGE}FILES+= test_01.JP.err
+${PACKAGE}FILES+= test_01.JP.out
+${PACKAGE}FILES+= test_01.T.err
+${PACKAGE}FILES+= test_01.T.out
+${PACKAGE}FILES+= test_01.X.err
+${PACKAGE}FILES+= test_01.X.out
+${PACKAGE}FILES+= test_01.XP.err
+${PACKAGE}FILES+= test_01.XP.out
+${PACKAGE}FILES+= test_01.err
+${PACKAGE}FILES+= test_01.out
+${PACKAGE}FILES+= test_02.E.err
+${PACKAGE}FILES+= test_02.E.out
+${PACKAGE}FILES+= test_02.H.err
+${PACKAGE}FILES+= test_02.H.out
+${PACKAGE}FILES+= test_02.HIPx.err
+${PACKAGE}FILES+= test_02.HIPx.out
+${PACKAGE}FILES+= test_02.HP.err
+${PACKAGE}FILES+= test_02.HP.out
+${PACKAGE}FILES+= test_02.J.err
+${PACKAGE}FILES+= test_02.J.out
+${PACKAGE}FILES+= test_02.JP.err
+${PACKAGE}FILES+= test_02.JP.out
+${PACKAGE}FILES+= test_02.T.err
+${PACKAGE}FILES+= test_02.T.out
+${PACKAGE}FILES+= test_02.X.err
+${PACKAGE}FILES+= test_02.X.out
+${PACKAGE}FILES+= test_02.XP.err
+${PACKAGE}FILES+= test_02.XP.out
+${PACKAGE}FILES+= test_02.err
+${PACKAGE}FILES+= test_02.out
+${PACKAGE}FILES+= test_03.E.err
+${PACKAGE}FILES+= test_03.E.out
+${PACKAGE}FILES+= test_03.H.err
+${PACKAGE}FILES+= test_03.H.out
+${PACKAGE}FILES+= test_03.HIPx.err
+${PACKAGE}FILES+= test_03.HIPx.out
+${PACKAGE}FILES+= test_03.HP.err
+${PACKAGE}FILES+= test_03.HP.out
+${PACKAGE}FILES+= test_03.J.err
+${PACKAGE}FILES+= test_03.J.out
+${PACKAGE}FILES+= test_03.JP.err
+${PACKAGE}FILES+= test_03.JP.out
+${PACKAGE}FILES+= test_03.T.err
+${PACKAGE}FILES+= test_03.T.out
+${PACKAGE}FILES+= test_03.X.err
+${PACKAGE}FILES+= test_03.X.out
+${PACKAGE}FILES+= test_03.XP.err
+${PACKAGE}FILES+= test_03.XP.out
+${PACKAGE}FILES+= test_03.err
+${PACKAGE}FILES+= test_03.out
+${PACKAGE}FILES+= test_04.E.err
+${PACKAGE}FILES+= test_04.E.out
+${PACKAGE}FILES+= test_04.H.err
+${PACKAGE}FILES+= test_04.H.out
+${PACKAGE}FILES+= test_04.HIPx.err
+${PACKAGE}FILES+= test_04.HIPx.out
+${PACKAGE}FILES+= test_04.HP.err
+${PACKAGE}FILES+= test_04.HP.out
+${PACKAGE}FILES+= test_04.J.err
+${PACKAGE}FILES+= test_04.J.out
+${PACKAGE}FILES+= test_04.JP.err
+${PACKAGE}FILES+= test_04.JP.out
+${PACKAGE}FILES+= test_04.T.err
+${PACKAGE}FILES+= test_04.T.out
+${PACKAGE}FILES+= test_04.X.err
+${PACKAGE}FILES+= test_04.X.out
+${PACKAGE}FILES+= test_04.XP.err
+${PACKAGE}FILES+= test_04.XP.out
+${PACKAGE}FILES+= test_05.E.err
+${PACKAGE}FILES+= test_05.E.out
+${PACKAGE}FILES+= test_05.H.err
+${PACKAGE}FILES+= test_05.H.out
+${PACKAGE}FILES+= test_05.HIPx.err
+${PACKAGE}FILES+= test_05.HIPx.out
+${PACKAGE}FILES+= test_05.HP.err
+${PACKAGE}FILES+= test_05.HP.out
+${PACKAGE}FILES+= test_05.J.err
+${PACKAGE}FILES+= test_05.J.out
+${PACKAGE}FILES+= test_05.JP.err
+${PACKAGE}FILES+= test_05.JP.out
+${PACKAGE}FILES+= test_05.T.err
+${PACKAGE}FILES+= test_05.T.out
+${PACKAGE}FILES+= test_05.X.err
+${PACKAGE}FILES+= test_05.X.out
+${PACKAGE}FILES+= test_05.XP.err
+${PACKAGE}FILES+= test_05.XP.out
+${PACKAGE}FILES+= test_06.E.err
+${PACKAGE}FILES+= test_06.E.out
+${PACKAGE}FILES+= test_06.H.err
+${PACKAGE}FILES+= test_06.H.out
+${PACKAGE}FILES+= test_06.HIPx.err
+${PACKAGE}FILES+= test_06.HIPx.out
+${PACKAGE}FILES+= test_06.HP.err
+${PACKAGE}FILES+= test_06.HP.out
+${PACKAGE}FILES+= test_06.J.err
+${PACKAGE}FILES+= test_06.J.out
+${PACKAGE}FILES+= test_06.JP.err
+${PACKAGE}FILES+= test_06.JP.out
+${PACKAGE}FILES+= test_06.T.err
+${PACKAGE}FILES+= test_06.T.out
+${PACKAGE}FILES+= test_06.X.err
+${PACKAGE}FILES+= test_06.X.out
+${PACKAGE}FILES+= test_06.XP.err
+${PACKAGE}FILES+= test_06.XP.out
+${PACKAGE}FILES+= test_07.E.err
+${PACKAGE}FILES+= test_07.E.out
+${PACKAGE}FILES+= test_07.H.err
+${PACKAGE}FILES+= test_07.H.out
+${PACKAGE}FILES+= test_07.HIPx.err
+${PACKAGE}FILES+= test_07.HIPx.out
+${PACKAGE}FILES+= test_07.HP.err
+${PACKAGE}FILES+= test_07.HP.out
+${PACKAGE}FILES+= test_07.J.err
+${PACKAGE}FILES+= test_07.J.out
+${PACKAGE}FILES+= test_07.JP.err
+${PACKAGE}FILES+= test_07.JP.out
+${PACKAGE}FILES+= test_07.T.err
+${PACKAGE}FILES+= test_07.T.out
+${PACKAGE}FILES+= test_07.X.err
+${PACKAGE}FILES+= test_07.X.out
+${PACKAGE}FILES+= test_07.XP.err
+${PACKAGE}FILES+= test_07.XP.out
+${PACKAGE}FILES+= test_08.E.err
+${PACKAGE}FILES+= test_08.E.out
+${PACKAGE}FILES+= test_08.H.err
+${PACKAGE}FILES+= test_08.H.out
+${PACKAGE}FILES+= test_08.HIPx.err
+${PACKAGE}FILES+= test_08.HIPx.out
+${PACKAGE}FILES+= test_08.HP.err
+${PACKAGE}FILES+= test_08.HP.out
+${PACKAGE}FILES+= test_08.J.err
+${PACKAGE}FILES+= test_08.J.out
+${PACKAGE}FILES+= test_08.JP.err
+${PACKAGE}FILES+= test_08.JP.out
+${PACKAGE}FILES+= test_08.T.err
+${PACKAGE}FILES+= test_08.T.out
+${PACKAGE}FILES+= test_08.X.err
+${PACKAGE}FILES+= test_08.X.out
+${PACKAGE}FILES+= test_08.XP.err
+${PACKAGE}FILES+= test_08.XP.out
+${PACKAGE}FILES+= test_09.E.err
+${PACKAGE}FILES+= test_09.E.out
+${PACKAGE}FILES+= test_09.H.err
+${PACKAGE}FILES+= test_09.H.out
+${PACKAGE}FILES+= test_09.HIPx.err
+${PACKAGE}FILES+= test_09.HIPx.out
+${PACKAGE}FILES+= test_09.HP.err
+${PACKAGE}FILES+= test_09.HP.out
+${PACKAGE}FILES+= test_09.J.err
+${PACKAGE}FILES+= test_09.J.out
+${PACKAGE}FILES+= test_09.JP.err
+${PACKAGE}FILES+= test_09.JP.out
+${PACKAGE}FILES+= test_09.T.err
+${PACKAGE}FILES+= test_09.T.out
+${PACKAGE}FILES+= test_09.X.err
+${PACKAGE}FILES+= test_09.X.out
+${PACKAGE}FILES+= test_09.XP.err
+${PACKAGE}FILES+= test_09.XP.out
+${PACKAGE}FILES+= test_10.E.err
+${PACKAGE}FILES+= test_10.E.out
+${PACKAGE}FILES+= test_10.H.err
+${PACKAGE}FILES+= test_10.H.out
+${PACKAGE}FILES+= test_10.HIPx.err
+${PACKAGE}FILES+= test_10.HIPx.out
+${PACKAGE}FILES+= test_10.HP.err
+${PACKAGE}FILES+= test_10.HP.out
+${PACKAGE}FILES+= test_10.J.err
+${PACKAGE}FILES+= test_10.J.out
+${PACKAGE}FILES+= test_10.JP.err
+${PACKAGE}FILES+= test_10.JP.out
+${PACKAGE}FILES+= test_10.T.err
+${PACKAGE}FILES+= test_10.T.out
+${PACKAGE}FILES+= test_10.X.err
+${PACKAGE}FILES+= test_10.X.out
+${PACKAGE}FILES+= test_10.XP.err
+${PACKAGE}FILES+= test_10.XP.out
+${PACKAGE}FILES+= test_10.err
+${PACKAGE}FILES+= test_10.out
+${PACKAGE}FILES+= test_11.E.err
+${PACKAGE}FILES+= test_11.E.out
+${PACKAGE}FILES+= test_11.H.err
+${PACKAGE}FILES+= test_11.H.out
+${PACKAGE}FILES+= test_11.HIPx.err
+${PACKAGE}FILES+= test_11.HIPx.out
+${PACKAGE}FILES+= test_11.HP.err
+${PACKAGE}FILES+= test_11.HP.out
+${PACKAGE}FILES+= test_11.J.err
+${PACKAGE}FILES+= test_11.J.out
+${PACKAGE}FILES+= test_11.JP.err
+${PACKAGE}FILES+= test_11.JP.out
+${PACKAGE}FILES+= test_11.T.err
+${PACKAGE}FILES+= test_11.T.out
+${PACKAGE}FILES+= test_11.X.err
+${PACKAGE}FILES+= test_11.X.out
+${PACKAGE}FILES+= test_11.XP.err
+${PACKAGE}FILES+= test_11.XP.out
PROGS+= test_01
PROGS+= test_02
diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile
index 491af0cb1d9a..2fe42457f2e8 100644
--- a/lib/libxo/tests/encoder/Makefile
+++ b/lib/libxo/tests/encoder/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
LIBXOSRC= ${SRCTOP}/contrib/libxo
.PATH: ${LIBXOSRC}/encoder/test
diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile
index 3e0823fe02ff..37dd34f0fdb0 100644
--- a/lib/msun/tests/Makefile
+++ b/lib/msun/tests/Makefile
@@ -2,9 +2,6 @@
.include <bsd.own.mk>
-PACKAGE=tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm
# All architectures on FreeBSD have fenv.h
diff --git a/lib/tests/Makefile b/lib/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/lib/tests/Makefile
+++ b/lib/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile
index d17f8b42326e..c244cf33a0ce 100644
--- a/libexec/atf/atf-check/tests/Makefile
+++ b/libexec/atf/atf-check/tests/Makefile
@@ -1,11 +1,5 @@
# $FreeBSD$
-.include <bsd.init.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile
index b52c88d5d989..9ccd6a7a44f1 100644
--- a/libexec/atf/atf-sh/tests/Makefile
+++ b/libexec/atf/atf-sh/tests/Makefile
@@ -2,12 +2,6 @@
.include <bsd.init.mk>
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/libexec/atf/tests/Makefile
+++ b/libexec/atf/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile
index f6ca6054ddb5..ef15a45474ba 100644
--- a/libexec/rtld-elf/tests/Makefile
+++ b/libexec/rtld-elf/tests/Makefile
@@ -1,10 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
SUBDIR+= libpythagoras target
SUBDIR_DEPEND_target= libpythagoras
diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile
index 0e52dbd67d00..9ad4b883015c 100644
--- a/libexec/rtld-elf/tests/libpythagoras/Makefile
+++ b/libexec/rtld-elf/tests/libpythagoras/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
LIB= pythagoras
SHLIB_MAJOR= 0
diff --git a/libexec/rtld-elf/tests/target/Makefile b/libexec/rtld-elf/tests/target/Makefile
index 7d80057ebd96..d5305f9b0501 100644
--- a/libexec/rtld-elf/tests/target/Makefile
+++ b/libexec/rtld-elf/tests/target/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
PROG= target
BINDIR= ${TESTSBASE}/libexec/rtld-elf
diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/libexec/tests/Makefile
+++ b/libexec/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile
index bdec4c454a57..e06928c5571c 100644
--- a/sbin/devd/tests/Makefile
+++ b/sbin/devd/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_C= client_test
TEST_METADATA.client_test= required_programs="devd"
TEST_METADATA.client_test+= required_user="root"
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
index 88516d920725..2852aaf2cda8 100644
--- a/sbin/dhclient/tests/Makefile
+++ b/sbin/dhclient/tests/Makefile
@@ -1,10 +1,6 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
PLAIN_TESTS_C= option-domain-search_test
SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \
diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile
index 5fdceb755cef..6a3208d9c441 100644
--- a/sbin/growfs/tests/Makefile
+++ b/sbin/growfs/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>
diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile
index 8a551917d709..93967c705175 100644
--- a/sbin/ifconfig/tests/Makefile
+++ b/sbin/ifconfig/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= nonexistent_test
.include <netbsd-tests.test.mk>
diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile
index 58507d39799b..6c179fcf59ad 100644
--- a/sbin/mdconfig/tests/Makefile
+++ b/sbin/mdconfig/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH= mdconfig_test
TEST_METADATA.mdconfig_test+= required_user="root"
diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/sbin/tests/Makefile
+++ b/sbin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/secure/lib/tests/Makefile
+++ b/secure/lib/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/secure/libexec/tests/Makefile
+++ b/secure/libexec/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/secure/tests/Makefile b/secure/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/secure/tests/Makefile
+++ b/secure/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/secure/usr.bin/tests/Makefile
+++ b/secure/usr.bin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/secure/usr.sbin/tests/Makefile
+++ b/secure/usr.sbin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile
index 77d89a4880ad..df273c982648 100644
--- a/share/examples/tests/Makefile
+++ b/share/examples/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
SUBDIR= tests
.PATH: ${SRCTOP}/tests
diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile
index 08b60493afb4..9f7b5a4729c4 100644
--- a/share/examples/tests/tests/Makefile
+++ b/share/examples/tests/tests/Makefile
@@ -2,11 +2,6 @@
.include <bsd.own.mk>
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
# Directory into which the Kyuafile provided by this directory will be
# installed.
#
diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile
index 6628a21775ba..c846d67aeadb 100644
--- a/share/examples/tests/tests/atf/Makefile
+++ b/share/examples/tests/tests/atf/Makefile
@@ -2,11 +2,11 @@
.include <bsd.own.mk>
-FILESGROUPS= FILES
+# The release package to use for the tests contained within the directory
+#
+# This applies to components which rely on ^/projects/release-pkg support
+# (see UPDATING XXXXXXXXX / svn revision r298107).
PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
# Directory into which the Kyuafile provided by this directory will be
# installed.
@@ -33,4 +33,19 @@ ATF_TESTS_SH= cp_test
# definitions from above.
KYUAFILE= yes
+# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional
+# ${PACKAGE} namespace of files.
+#
+# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the
+# installation of the files can be manipulated via ${PACKAGE}FILESDIR,
+# ${PACKAGE}FILESMODE, etc.
+#
+# Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE}
+# namespace if release package support isn't needed.
+${PACKAGE}FILES+= file1
+CLEANFILES+= file1
+
+file1:
+ @echo "File 1" > ${.TARGET}
+
.include <bsd.test.mk>
diff --git a/share/examples/tests/tests/atf/cp_test.sh b/share/examples/tests/tests/atf/cp_test.sh
index 83d691460d0f..befec0911ba3 100644
--- a/share/examples/tests/tests/atf/cp_test.sh
+++ b/share/examples/tests/tests/atf/cp_test.sh
@@ -61,7 +61,7 @@ verify_copy() {
#
atf_test_case simple
simple_body() {
- echo 'File 1' >file1
+ cp $(atf_get_srcdir)/file1 .
# The atf_check function is a very powerful function of atf-sh.
# It allows you to define checkers for the exit status, the
@@ -102,7 +102,7 @@ force_head() {
"override the destination file"
}
force_body() {
- echo 'File 1' >file1
+ cp $(atf_get_srcdir)/file1 .
echo 'File 2' >file2
chmod 400 file2
atf_check cp -f file1 file2
diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile
index e01de619654d..d9807aa46a7d 100644
--- a/share/examples/tests/tests/plain/Makefile
+++ b/share/examples/tests/tests/plain/Makefile
@@ -2,11 +2,11 @@
.include <bsd.own.mk>
-FILESGROUPS= FILES
+# The release package to use for the tests contained within the directory
+#
+# This applies to components which rely on ^/projects/release-pkg support
+# (see UPDATING XXXXXXXXX / svn revision r298107).
PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
# Directory into which the Kyuafile provided by this directory will be
# installed.
@@ -33,4 +33,19 @@ PLAIN_TESTS_SH= cp_test
# definitions from above.
KYUAFILE= yes
+# Install file1 and file2 as files via bsd.prog.mk. Please note the intentional
+# ${PACKAGE} namespace of files.
+#
+# The basic semantics of this are the same as FILES in bsd.prog.mk, e.g. the
+# installation of the files can be manipulated via ${PACKAGE}FILESDIR,
+# ${PACKAGE}FILESMODE, etc.
+#
+# Please see comment above about ${PACKAGE}. Feel free to omit the ${PACKAGE}
+# namespace if release package support isn't needed.
+${PACKAGE}FILES+= file1
+CLEANFILES+= file1
+
+file1:
+ @echo "File 1" > ${.TARGET}
+
.include <bsd.test.mk>
diff --git a/share/examples/tests/tests/plain/cp_test.sh b/share/examples/tests/tests/plain/cp_test.sh
index c45d68490db6..b47d33d0a02c 100644
--- a/share/examples/tests/tests/plain/cp_test.sh
+++ b/share/examples/tests/tests/plain/cp_test.sh
@@ -57,17 +57,16 @@ verify_copy() {
}
simple_test() {
- echo 'File 1' >file1
+ cp "$(dirname "${0}")/file1" .
cp file1 file2 || err "cp failed"
verify_copy file1 file2
}
force_test() {
- echo 'File 1' >file1
- echo 'File 2' >file2
- chmod 400 file2
- cp -f file1 file2 || err "cp failed"
- verify_copy file1 file2
+ echo 'File 3' >file3
+ chmod 400 file3
+ cp -f file1 file3 || err "cp failed"
+ verify_copy file1 file3
}
# If you have read the cp_test.sh counterpart in the atf/ directory, you
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index 97240ccbd11e..31bb9a6a1b5b 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -15,7 +15,12 @@ LOCALBASE?= /usr/local
# Tests install directory
TESTSDIR?= ${TESTSBASE}/${RELDIR:H}
-PACKAGE= tests
+
+PACKAGE?= tests
+
+FILESGROUPS+= ${PACKAGE}FILES
+${PACKAGE}FILESPACKAGE= ${PACKAGE}
+${PACKAGE}FILESDIR= ${TESTSDIR}
# List of subdirectories containing tests into which to recurse. This has the
# same semantics as SUBDIR at build-time. However, the directories listed here
diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk
index 646d2ebc6d83..9e7dc9e99ae7 100644
--- a/share/mk/suite.test.mk
+++ b/share/mk/suite.test.mk
@@ -46,8 +46,8 @@ KYUAFILE?= auto
#TEST_METADATA.<test-program>+= key="value"
.if ${KYUAFILE:tl} != "no"
-FILES+= Kyuafile
-FILESDIR_Kyuafile= ${TESTSDIR}
+${PACKAGE}FILES+= Kyuafile
+${PACKAGE}FILESDIR_Kyuafile= ${TESTSDIR}
.endif
.for _T in ${_TESTS}
diff --git a/share/tests/Makefile b/share/tests/Makefile
index f3c2ef3ee8da..3b3078f8612a 100644
--- a/share/tests/Makefile
+++ b/share/tests/Makefile
@@ -1,14 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-TESTSDIR= ${TESTSBASE}/share
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/sys/modules/tests/callout_test/Makefile b/sys/modules/tests/callout_test/Makefile
index eadcadc5026a..4781488af3b8 100644
--- a/sys/modules/tests/callout_test/Makefile
+++ b/sys/modules/tests/callout_test/Makefile
@@ -2,10 +2,6 @@
# $FreeBSD$
#
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
.PATH: ${.CURDIR}/../../../tests/callout_test
KMOD= callout_test
diff --git a/sys/modules/tests/framework/Makefile b/sys/modules/tests/framework/Makefile
index c56838dd92d2..f5f608fb0465 100644
--- a/sys/modules/tests/framework/Makefile
+++ b/sys/modules/tests/framework/Makefile
@@ -2,10 +2,6 @@
# $FreeBSD$
#
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
.PATH: ${.CURDIR}/../../../tests/framework
KMOD= kern_testfrwk
diff --git a/tests/Makefile b/tests/Makefile
index 92e462f03ea3..0aed9cfb1b83 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,22 +1,17 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
-SUBDIR+= etc
-SUBDIR+= sys
-SUBDIR_PARALLEL=
TESTSDIR= ${TESTSBASE}
+
+${PACKAGE}FILES+= README
+
KYUAFILE= yes
-FILES+= README
-FILESDIR_README= ${TESTSDIR}
+SUBDIR+= etc
+SUBDIR+= sys
+
+SUBDIR_PARALLEL=
afterinstall: install-tests-local
install-tests-local: .PHONY
diff --git a/tests/etc/Makefile b/tests/etc/Makefile
index 6e02e3214d4e..1e49666767c0 100644
--- a/tests/etc/Makefile
+++ b/tests/etc/Makefile
@@ -2,12 +2,6 @@
.include <bsd.own.mk>
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
TESTSDIR= ${TESTSBASE}/etc
.PATH: ${SRCTOP}/tests
diff --git a/tests/etc/rc.d/Makefile b/tests/etc/rc.d/Makefile
index 3b946a3b5a90..368e8f4fc875 100644
--- a/tests/etc/rc.d/Makefile
+++ b/tests/etc/rc.d/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/etc/rc.d
ATF_TESTS_SH+= routing_test
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 1d488bf59d34..944e820ac1ae 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -1,10 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys
TESTS_SUBDIRS+= acl
diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile
index 7db6682de41c..92789a206aad 100644
--- a/tests/sys/acl/Makefile
+++ b/tests/sys/acl/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/acl
BINDIR= ${TESTSDIR}
-FILES+= tools-crossfs.test
-FILES+= tools-nfs4.test
-FILES+= tools-nfs4-psarc.test
-FILES+= tools-nfs4-trivial.test
-FILES+= tools-posix.test
+${PACKAGE}FILES+= tools-crossfs.test
+${PACKAGE}FILES+= tools-nfs4.test
+${PACKAGE}FILES+= tools-nfs4-psarc.test
+${PACKAGE}FILES+= tools-nfs4-trivial.test
+${PACKAGE}FILES+= tools-posix.test
SCRIPTS+= run
diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile
index 0003b844cc9b..98b436068a9a 100644
--- a/tests/sys/aio/Makefile
+++ b/tests/sys/aio/Makefile
@@ -1,13 +1,11 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/aio
+ATF_TESTS_C+= aio_test
+
PLAIN_TESTS_C+= aio_kqueue_test
PLAIN_TESTS_C+= lio_kqueue_test
-ATF_TESTS_C+= aio_test
LIBADD.aio_test+= util
diff --git a/tests/sys/fifo/Makefile b/tests/sys/fifo/Makefile
index 750d5db2a91d..602bf1ed2940 100644
--- a/tests/sys/fifo/Makefile
+++ b/tests/sys/fifo/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/fifo
PLAIN_TESTS_C+= fifo_create
diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile
index 0b3c0fc5da61..ed2d2c4fbe2e 100644
--- a/tests/sys/file/Makefile
+++ b/tests/sys/file/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/file
BINDIR= ${TESTSDIR}
diff --git a/tests/sys/geom/Makefile b/tests/sys/geom/Makefile
index e6ecc836da84..bf8604dcabc3 100644
--- a/tests/sys/geom/Makefile
+++ b/tests/sys/geom/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/geom
TESTS_SUBDIRS+= class
diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile
index d4f6168cd8c6..b633fd081ee1 100644
--- a/tests/sys/geom/class/Makefile
+++ b/tests/sys/geom/class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class
TESTS_SUBDIRS+= concat
@@ -17,8 +16,6 @@ TESTS_SUBDIRS+= shsec
TESTS_SUBDIRS+= stripe
TESTS_SUBDIRS+= uzip
-BINDIR= ${TESTSDIR}
-
-FILES+= geom_subr.sh
+${PACKAGE}FILES+= geom_subr.sh
.include <bsd.test.mk>
diff --git a/tests/sys/geom/class/concat/Makefile b/tests/sys/geom/class/concat/Makefile
index cd1eb6174a10..b0849962aa01 100644
--- a/tests/sys/geom/class/concat/Makefile
+++ b/tests/sys/geom/class/concat/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile
index 65ee1923e975..d827e1f48d90 100644
--- a/tests/sys/geom/class/eli/Makefile
+++ b/tests/sys/geom/class/eli/Makefile
@@ -1,10 +1,8 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= attach_d_test
TAP_TESTS_SH+= configure_b_B_test
@@ -35,9 +33,7 @@ TEST_METADATA.integrity_hmac_test+= timeout="600"
TEST_METADATA.onetime_a_test+= timeout="600"
TEST_METADATA.onetime_test+= timeout="600"
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile
index 25bcc2a1e7ea..c034bf037efb 100644
--- a/tests/sys/geom/class/gate/Makefile
+++ b/tests/sys/geom/class/gate/Makefile
@@ -1,18 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
TAP_TESTS_SH+= 3_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile
index c2f732c83b60..2665631d606b 100644
--- a/tests/sys/geom/class/mirror/Makefile
+++ b/tests/sys/geom/class/mirror/Makefile
@@ -1,10 +1,8 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
@@ -14,9 +12,7 @@ TAP_TESTS_SH+= 5_test
TAP_TESTS_SH+= 6_test
TAP_TESTS_SH+= 7_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile
index cd1eb6174a10..b0849962aa01 100644
--- a/tests/sys/geom/class/nop/Makefile
+++ b/tests/sys/geom/class/nop/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile
index 3981ec7de2ac..a53a937cee69 100644
--- a/tests/sys/geom/class/raid3/Makefile
+++ b/tests/sys/geom/class/raid3/Makefile
@@ -1,10 +1,8 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
@@ -19,9 +17,7 @@ TAP_TESTS_SH+= 10_test
TAP_TESTS_SH+= 11_test
TAP_TESTS_SH+= 12_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile
index cd1eb6174a10..b0849962aa01 100644
--- a/tests/sys/geom/class/shsec/Makefile
+++ b/tests/sys/geom/class/shsec/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile
index cd1eb6174a10..b0849962aa01 100644
--- a/tests/sys/geom/class/stripe/Makefile
+++ b/tests/sys/geom/class/stripe/Makefile
@@ -1,17 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
-TESTS+= ${FILES}
TAP_TESTS_SH+= 1_test
TAP_TESTS_SH+= 2_test
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh
.for t in ${TAP_TESTS_SH}
TEST_METADATA.$t+= required_user="root"
diff --git a/tests/sys/geom/class/uzip/Makefile b/tests/sys/geom/class/uzip/Makefile
index 91c874e30c30..89b643e07021 100644
--- a/tests/sys/geom/class/uzip/Makefile
+++ b/tests/sys/geom/class/uzip/Makefile
@@ -5,8 +5,7 @@
#
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T}
IMAGE= 1.img
@@ -26,16 +25,12 @@ ${UZIMAGE}: ${IMAGE} ${ZIMAGE}
printf "FreeBSD$$\n#\n\n" >> ${.TARGET}
uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET}
-FILES+= conf.sh
-FILESNAME_conf.sh= conf.sh
-
-FILES+= ${UZIMAGE}
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= conf.sh \
+ ${UZIMAGE}
-FILESGROUPS+= FILES etalon
+FILESGROUPS+= etalon
etalon+= etalon/etalon.txt
etalonDIR= ${TESTSDIR}/etalon
-FILESPACKAGE= ${PACKAGE}
etalonPACKAGE= ${PACKAGE}
TAP_TESTS_SH+= 1_test
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index 4a24a400e577..ee9959e862ac 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel
.PATH: ${SRCTOP}/sys/kern
diff --git a/tests/sys/kern/acct/Makefile b/tests/sys/kern/acct/Makefile
index 3a9a7ecdf1a5..ca3df4c6c703 100644
--- a/tests/sys/kern/acct/Makefile
+++ b/tests/sys/kern/acct/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/kern/acct
ATF_TESTS_C= acct_test
diff --git a/tests/sys/kern/execve/Makefile b/tests/sys/kern/execve/Makefile
index a029b8f88bc0..82c5d4b85b10 100644
--- a/tests/sys/kern/execve/Makefile
+++ b/tests/sys/kern/execve/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/kern/execve
BINDIR= ${TESTSDIR}
diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile
index bcc61b4a0e5b..bcd2d070cc8b 100644
--- a/tests/sys/kern/pipe/Makefile
+++ b/tests/sys/kern/pipe/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/kern/pipe
PLAIN_TESTS_C+= big_pipe_test
diff --git a/tests/sys/kqueue/Makefile b/tests/sys/kqueue/Makefile
index 2ec462a625e9..43277ca0c86b 100644
--- a/tests/sys/kqueue/Makefile
+++ b/tests/sys/kqueue/Makefile
@@ -6,9 +6,6 @@
# libkqueue and test suite by Mark Heily <mark@heily.com>
#
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= kqueue_test
TESTSDIR= ${TESTSBASE}/sys/kqueue
diff --git a/tests/sys/mac/Makefile b/tests/sys/mac/Makefile
index db9189560242..ae2c4917b0d1 100644
--- a/tests/sys/mac/Makefile
+++ b/tests/sys/mac/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/mac
TESTS_SUBDIRS+= bsdextended
diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile
index 8fdee52c2fc4..9d0b6f6907ca 100644
--- a/tests/sys/mac/bsdextended/Makefile
+++ b/tests/sys/mac/bsdextended/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/mac/bsdextended
TAP_TESTS_C+= ugidfw_test
diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile
index b894c8c517df..6564ef93cdd1 100644
--- a/tests/sys/mac/portacl/Makefile
+++ b/tests/sys/mac/portacl/Makefile
@@ -1,12 +1,10 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/mac/portacl
-BINDIR= ${TESTSDIR}
-FILES+= misc.sh
+${PACKAGE}FILES+= misc.sh
TAP_TESTS_SH+= nobody_test
TAP_TESTS_SH+= root_test
diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile
index 6ccd2758916d..ce5033c6a683 100644
--- a/tests/sys/mqueue/Makefile
+++ b/tests/sys/mqueue/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/mqueue
ATF_TESTS_SH= mqueue_test
diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile
index 4fe29224ee0e..14cee19fab99 100644
--- a/tests/sys/netinet/Makefile
+++ b/tests/sys/netinet/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/sys/netinet
BINDIR= ${TESTSDIR}
ATF_TESTS_SH= fibs_test
+
PROGS= udp_dontroute
+
MAN=
+
WARNS?= 6
.include <bsd.test.mk>
diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile
index 96cc86b44ffd..17b9850384ac 100644
--- a/tests/sys/opencrypto/Makefile
+++ b/tests/sys/opencrypto/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/opencrypto
BINDIR= ${TESTSDIR}
@@ -11,7 +10,6 @@ PLAIN_TESTS_SH= runtests
TEST_METADATA.foo+=required_programs="python"
PYMODULES= cryptodev.py cryptodevh.py cryptotest.py dpkt.py
-FILESDIR= ${TESTSDIR}
-FILES= ${PYMODULES}
+${PACKAGE}FILES+= ${PYMODULES}
.include <bsd.test.mk>
diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile
index 65f562a27013..77613029bd0a 100644
--- a/tests/sys/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
SUBDIR+= pjdfstest
SUBDIR+= tests
+
SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile
index 8ae74e7959b9..0d47366b6ee6 100644
--- a/tests/sys/pjdfstest/pjdfstest/Makefile
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile
@@ -1,11 +1,8 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TOP= ${.CURDIR:H:H:H:H}
-.PATH: ${TOP}/contrib/pjdfstest
+.PATH: ${SRCTOP}/contrib/pjdfstest
BINDIR= ${TESTSBASE}/sys/pjdfstest
PROG= pjdfstest
diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile
index 951ac9a7c031..f3757f27d3ef 100644
--- a/tests/sys/pjdfstest/tests/Makefile
+++ b/tests/sys/pjdfstest/tests/Makefile
@@ -1,17 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest
TESTSDIR= ${TESTSBASE}/sys/pjdfstest
.PATH: ${.CURDIR}
-FILESDIR= ${TESTSDIR}
-FILES= conf
-FILES+= misc.sh
+${PACKAGE}FILES+= conf
+${PACKAGE}FILES+= misc.sh
CLEANFILES+= misc.sh misc.sh.tmp
misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh
diff --git a/tests/sys/pjdfstest/tests/chflags/Makefile b/tests/sys/pjdfstest/tests/chflags/Makefile
index 2865f9da704e..3b6a5265fdd4 100644
--- a/tests/sys/pjdfstest/tests/chflags/Makefile
+++ b/tests/sys/pjdfstest/tests/chflags/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/chmod/Makefile b/tests/sys/pjdfstest/tests/chmod/Makefile
index 10227c14012d..cc0a3bbf1af4 100644
--- a/tests/sys/pjdfstest/tests/chmod/Makefile
+++ b/tests/sys/pjdfstest/tests/chmod/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/chown/Makefile b/tests/sys/pjdfstest/tests/chown/Makefile
index f8fa004908c1..665b6538d19e 100644
--- a/tests/sys/pjdfstest/tests/chown/Makefile
+++ b/tests/sys/pjdfstest/tests/chown/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/ftruncate/Makefile b/tests/sys/pjdfstest/tests/ftruncate/Makefile
index 67570a831e31..da2ce584d3af 100644
--- a/tests/sys/pjdfstest/tests/ftruncate/Makefile
+++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/granular/Makefile b/tests/sys/pjdfstest/tests/granular/Makefile
index 4f0d071622e8..3f935e4e99ce 100644
--- a/tests/sys/pjdfstest/tests/granular/Makefile
+++ b/tests/sys/pjdfstest/tests/granular/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/link/Makefile b/tests/sys/pjdfstest/tests/link/Makefile
index af74c4a0fa2f..14c7525689b0 100644
--- a/tests/sys/pjdfstest/tests/link/Makefile
+++ b/tests/sys/pjdfstest/tests/link/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/mkdir/Makefile b/tests/sys/pjdfstest/tests/mkdir/Makefile
index 10227c14012d..cc0a3bbf1af4 100644
--- a/tests/sys/pjdfstest/tests/mkdir/Makefile
+++ b/tests/sys/pjdfstest/tests/mkdir/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/mkfifo/Makefile b/tests/sys/pjdfstest/tests/mkfifo/Makefile
index 10227c14012d..cc0a3bbf1af4 100644
--- a/tests/sys/pjdfstest/tests/mkfifo/Makefile
+++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/mknod/Makefile b/tests/sys/pjdfstest/tests/mknod/Makefile
index fd4152222c80..1eaeaa09818e 100644
--- a/tests/sys/pjdfstest/tests/mknod/Makefile
+++ b/tests/sys/pjdfstest/tests/mknod/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/open/Makefile b/tests/sys/pjdfstest/tests/open/Makefile
index c66cc3e3d301..bd2f7b5a985d 100644
--- a/tests/sys/pjdfstest/tests/open/Makefile
+++ b/tests/sys/pjdfstest/tests/open/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/rename/Makefile b/tests/sys/pjdfstest/tests/rename/Makefile
index 86984d99b1cb..7eada047ef15 100644
--- a/tests/sys/pjdfstest/tests/rename/Makefile
+++ b/tests/sys/pjdfstest/tests/rename/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/rmdir/Makefile b/tests/sys/pjdfstest/tests/rmdir/Makefile
index 31fd8ba8d0ff..301e4e5c33d1 100644
--- a/tests/sys/pjdfstest/tests/rmdir/Makefile
+++ b/tests/sys/pjdfstest/tests/rmdir/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/symlink/Makefile b/tests/sys/pjdfstest/tests/symlink/Makefile
index 10227c14012d..cc0a3bbf1af4 100644
--- a/tests/sys/pjdfstest/tests/symlink/Makefile
+++ b/tests/sys/pjdfstest/tests/symlink/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/truncate/Makefile b/tests/sys/pjdfstest/tests/truncate/Makefile
index 67570a831e31..da2ce584d3af 100644
--- a/tests/sys/pjdfstest/tests/truncate/Makefile
+++ b/tests/sys/pjdfstest/tests/truncate/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/pjdfstest/tests/unlink/Makefile b/tests/sys/pjdfstest/tests/unlink/Makefile
index 2865f9da704e..3b6a5265fdd4 100644
--- a/tests/sys/pjdfstest/tests/unlink/Makefile
+++ b/tests/sys/pjdfstest/tests/unlink/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= 00
TAP_TESTS_SH+= 01
TAP_TESTS_SH+= 02
diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile
index aab71d1adddc..6e9e345d5b16 100644
--- a/tests/sys/posixshm/Makefile
+++ b/tests/sys/posixshm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/posixshm
ATF_TESTS_C+= posixshm_test
diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile
index eee6d73b3ec5..3adf6b83e4e0 100644
--- a/tests/sys/sys/Makefile
+++ b/tests/sys/sys/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TESTSDIR= ${TESTSBASE}/sys/sys
ATF_TESTS_C= bitstring_test
diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile
index 09e451871783..cbab7e54fa74 100644
--- a/tests/sys/vfs/Makefile
+++ b/tests/sys/vfs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/vfs
PLAIN_TESTS_SH+= trailing_slash
diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile
index 9d1be8b389a4..a3c298b04b4d 100644
--- a/tests/sys/vm/Makefile
+++ b/tests/sys/vm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/sys/vm
ATF_TESTS_C+= mmap_test
diff --git a/usr.bin/apply/tests/Makefile b/usr.bin/apply/tests/Makefile
index 6348f89c19a9..af17a273ad8f 100644
--- a/usr.bin/apply/tests/Makefile
+++ b/usr.bin/apply/tests/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.00.in
-FILES+= regress.00.out
-FILES+= regress.01.out
-FILES+= regress.01.sh
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.00.in
+${PACKAGE}FILES+= regress.00.out
+${PACKAGE}FILES+= regress.01.out
+${PACKAGE}FILES+= regress.01.sh
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/basename/tests/Makefile b/usr.bin/basename/tests/Makefile
index cada2f7c3c03..bad7b2890432 100644
--- a/usr.bin/basename/tests/Makefile
+++ b/usr.bin/basename/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= basename_test
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/bmake/tests/Makefile b/usr.bin/bmake/tests/Makefile
index ee3dcf2f3968..6c343dac5900 100644
--- a/usr.bin/bmake/tests/Makefile
+++ b/usr.bin/bmake/tests/Makefile
@@ -1,13 +1,9 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTSDIR= ${TESTSBASE}/usr.bin/bmake
-FILESDIR= ${TESTSDIR}
-FILES= common.sh
-FILES+= test-new.mk
+${PACKAGE}FILES+= common.sh
+${PACKAGE}FILES+= test-new.mk
TESTS_SUBDIRS= archives
TESTS_SUBDIRS+= basic
diff --git a/usr.bin/bmake/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile
index c8914b94942f..f80ffc2e8989 100644
--- a/usr.bin/bmake/tests/archives/Makefile
+++ b/usr.bin/bmake/tests/archives/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives
TESTS_SUBDIRS= fmt_44bsd fmt_44bsd_mod fmt_oldbsd
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
index 5ef093f61708..99a2093b5f7b 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
@@ -1,35 +1,33 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.status.4
-FILES+= expected.status.5
-FILES+= expected.status.6
-FILES+= expected.status.7
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stderr.4
-FILES+= expected.stderr.5
-FILES+= expected.stderr.6
-FILES+= expected.stderr.7
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
-FILES+= expected.stdout.4
-FILES+= expected.stdout.5
-FILES+= expected.stdout.6
-FILES+= expected.stdout.7
-FILES+= libtest.a
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.status.4
+${PACKAGE}FILES+= expected.status.5
+${PACKAGE}FILES+= expected.status.6
+${PACKAGE}FILES+= expected.status.7
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stderr.4
+${PACKAGE}FILES+= expected.stderr.5
+${PACKAGE}FILES+= expected.stderr.6
+${PACKAGE}FILES+= expected.stderr.7
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
+${PACKAGE}FILES+= expected.stdout.4
+${PACKAGE}FILES+= expected.stdout.5
+${PACKAGE}FILES+= expected.stdout.6
+${PACKAGE}FILES+= expected.stdout.7
+${PACKAGE}FILES+= libtest.a
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
index 0b9db19071fd..baf3e440c3cc 100644
--- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
@@ -1,35 +1,33 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.status.4
-FILES+= expected.status.5
-FILES+= expected.status.6
-FILES+= expected.status.7
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stderr.4
-FILES+= expected.stderr.5
-FILES+= expected.stderr.6
-FILES+= expected.stderr.7
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
-FILES+= expected.stdout.4
-FILES+= expected.stdout.5
-FILES+= expected.stdout.6
-FILES+= expected.stdout.7
-FILES+= libtest.a
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.status.4
+${PACKAGE}FILES+= expected.status.5
+${PACKAGE}FILES+= expected.status.6
+${PACKAGE}FILES+= expected.status.7
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stderr.4
+${PACKAGE}FILES+= expected.stderr.5
+${PACKAGE}FILES+= expected.stderr.6
+${PACKAGE}FILES+= expected.stderr.7
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
+${PACKAGE}FILES+= expected.stdout.4
+${PACKAGE}FILES+= expected.stdout.5
+${PACKAGE}FILES+= expected.stdout.6
+${PACKAGE}FILES+= expected.stdout.7
+${PACKAGE}FILES+= libtest.a
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
index b76bdc19164e..2dbfa64e1b82 100644
--- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
+++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
@@ -1,35 +1,32 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.status.4
-FILES+= expected.status.5
-FILES+= expected.status.6
-FILES+= expected.status.7
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stderr.4
-FILES+= expected.stderr.5
-FILES+= expected.stderr.6
-FILES+= expected.stderr.7
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
-FILES+= expected.stdout.4
-FILES+= expected.stdout.5
-FILES+= expected.stdout.6
-FILES+= expected.stdout.7
-FILES+= libtest.a
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.status.4
+${PACKAGE}FILES+= expected.status.5
+${PACKAGE}FILES+= expected.status.6
+${PACKAGE}FILES+= expected.status.7
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stderr.4
+${PACKAGE}FILES+= expected.stderr.5
+${PACKAGE}FILES+= expected.stderr.6
+${PACKAGE}FILES+= expected.stderr.7
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
+${PACKAGE}FILES+= expected.stdout.4
+${PACKAGE}FILES+= expected.stdout.5
+${PACKAGE}FILES+= expected.stdout.6
+${PACKAGE}FILES+= expected.stdout.7
+${PACKAGE}FILES+= libtest.a
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile
index 1164a44674bd..56dfb33901c0 100644
--- a/usr.bin/bmake/tests/basic/Makefile
+++ b/usr.bin/bmake/tests/basic/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic
TESTS_SUBDIRS= t0 t1 t2 t3
diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile
index d1ee84d9a5b3..0f82a6491218 100644
--- a/usr.bin/bmake/tests/basic/t0/Makefile
+++ b/usr.bin/bmake/tests/basic/t0/Makefile
@@ -1,15 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t0
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile
index 3faeffab7764..b4bdb25aac52 100644
--- a/usr.bin/bmake/tests/basic/t1/Makefile
+++ b/usr.bin/bmake/tests/basic/t1/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t1
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile
index 6d7b6b494c43..1f0f7f95fa68 100644
--- a/usr.bin/bmake/tests/basic/t2/Makefile
+++ b/usr.bin/bmake/tests/basic/t2/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t2
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile
index 2b268e92f506..05532f3824d9 100644
--- a/usr.bin/bmake/tests/basic/t3/Makefile
+++ b/usr.bin/bmake/tests/basic/t3/Makefile
@@ -1,15 +1,13 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t3
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile
index 5b3bab7b76fd..2c91bbba23ea 100644
--- a/usr.bin/bmake/tests/execution/Makefile
+++ b/usr.bin/bmake/tests/execution/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution
TESTS_SUBDIRS= ellipsis empty joberr plus
diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile
index abc8b9e496e9..e3008fad6fe1 100644
--- a/usr.bin/bmake/tests/execution/ellipsis/Makefile
+++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile
index 282814036f20..3a9390c65549 100644
--- a/usr.bin/bmake/tests/execution/empty/Makefile
+++ b/usr.bin/bmake/tests/execution/empty/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile
index 7056afdb1653..8eeaa82e68a4 100644
--- a/usr.bin/bmake/tests/execution/joberr/Makefile
+++ b/usr.bin/bmake/tests/execution/joberr/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile
index c5e42bd385a4..884b991721d1 100644
--- a/usr.bin/bmake/tests/execution/plus/Makefile
+++ b/usr.bin/bmake/tests/execution/plus/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile
index ca0c99f1aa4c..13b570ea64db 100644
--- a/usr.bin/bmake/tests/shell/Makefile
+++ b/usr.bin/bmake/tests/shell/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell
TESTS_SUBDIRS= builtin meta path path_select replace select
diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile
index 713e8256315d..d603c46b8f06 100644
--- a/usr.bin/bmake/tests/shell/builtin/Makefile
+++ b/usr.bin/bmake/tests/shell/builtin/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/builtin
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= sh
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= sh
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile
index 4b14289a9b1b..f7cab6c3bae6 100644
--- a/usr.bin/bmake/tests/shell/meta/Makefile
+++ b/usr.bin/bmake/tests/shell/meta/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/meta
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= sh
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= sh
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile
index 8b1ce86794b2..6dbb8728df4a 100644
--- a/usr.bin/bmake/tests/shell/path/Makefile
+++ b/usr.bin/bmake/tests/shell/path/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= sh
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= sh
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile
index acc63395abc5..7fecfd327e50 100644
--- a/usr.bin/bmake/tests/shell/path_select/Makefile
+++ b/usr.bin/bmake/tests/shell/path_select/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path_select
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= shell
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= shell
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile
index b0f21ab5e747..980b99c95c8e 100644
--- a/usr.bin/bmake/tests/shell/replace/Makefile
+++ b/usr.bin/bmake/tests/shell/replace/Makefile
@@ -1,20 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/replace
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= shell
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= shell
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile
index e62701000031..1695c881d3ad 100644
--- a/usr.bin/bmake/tests/shell/select/Makefile
+++ b/usr.bin/bmake/tests/shell/select/Makefile
@@ -1,19 +1,17 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/select
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile
index 0839dfab3742..60ec86e7e5ee 100644
--- a/usr.bin/bmake/tests/suffixes/Makefile
+++ b/usr.bin/bmake/tests/suffixes/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes
TESTS_SUBDIRS= basic src_wild1 src_wild2
diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile
index d917de0c0f21..bbfc150a6925 100644
--- a/usr.bin/bmake/tests/suffixes/basic/Makefile
+++ b/usr.bin/bmake/tests/suffixes/basic/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/basic
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= TEST1.a
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES= Makefile.test
+${PACKAGE}FILES+= TEST1.a
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
index 621ec60ce75d..cfcfdca987a8 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= TEST1.a
-FILES+= TEST2.a
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= TEST1.a
+${PACKAGE}FILES+= TEST2.a
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
index a1c65351933b..d66ca354c443 100644
--- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
+++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= TEST1.a
-FILES+= TEST2.a
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= TEST1.a
+${PACKAGE}FILES+= TEST2.a
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile
index 2dd0df5995ce..3cd89f84428f 100644
--- a/usr.bin/bmake/tests/syntax/Makefile
+++ b/usr.bin/bmake/tests/syntax/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax
TESTS_SUBDIRS= directive-t0 enl funny-targets semi
diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
index e790b942f6d2..d29b8307ea1c 100644
--- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile
+++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/directive-t0
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile
index 0ba16a788c12..b41c752f861b 100644
--- a/usr.bin/bmake/tests/syntax/enl/Makefile
+++ b/usr.bin/bmake/tests/syntax/enl/Makefile
@@ -1,28 +1,26 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/enl
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.status.4
-FILES+= expected.status.5
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stderr.4
-FILES+= expected.stderr.5
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
-FILES+= expected.stdout.4
-FILES+= expected.stdout.5
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.status.4
+${PACKAGE}FILES+= expected.status.5
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stderr.4
+${PACKAGE}FILES+= expected.stderr.5
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
+${PACKAGE}FILES+= expected.stdout.4
+${PACKAGE}FILES+= expected.stdout.5
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
index 3e56b2b76a8e..eae22ec84e0c 100644
--- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile
+++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile
@@ -1,19 +1,17 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/funny-targets
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile
index cb57bbc71efe..c48e1759af9a 100644
--- a/usr.bin/bmake/tests/syntax/semi/Makefile
+++ b/usr.bin/bmake/tests/syntax/semi/Makefile
@@ -1,19 +1,17 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/semi
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile
index 8dccb0359d7c..90d90f1ddbd4 100644
--- a/usr.bin/bmake/tests/sysmk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk
TESTS_SUBDIRS= t0 t1 t2
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
index 87e6827d57fd..0522432e666b 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
index 2a6fc75df7e8..22048078844b 100644
--- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2
TESTS_SUBDIRS= 1
diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile
index d31d5619f65e..f38383c4e893 100644
--- a/usr.bin/bmake/tests/sysmk/t0/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0
TESTS_SUBDIRS= 2
diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
index e7620a5afce3..ef40ab9a968c 100644
--- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk
-FILESDIR= ${TESTSDIR}
-FILES= sys.mk.test
-FILESNAME_sys.mk.test= sys.mk
+${PACKAGE}FILES+= sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test= sys.mk
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
index a66fb25cb87e..eb01f5de1315 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= cleanup
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= cleanup
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
index bf3991a63bf3..7c2e61927ecf 100644
--- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2
TESTS_SUBDIRS= 1
diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile
index fac186f0d8a3..4d3282345516 100644
--- a/usr.bin/bmake/tests/sysmk/t1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1
TESTS_SUBDIRS= 2
diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
index dc46dd8b3e74..dea788d288b3 100644
--- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk
-FILESDIR= ${TESTSDIR}
-FILES= sys.mk.test
-FILESNAME_sys.mk.test= sys.mk
+${PACKAGE}FILES+= sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test= sys.mk
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
index 5ce319487925..36d05750553b 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= cleanup
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= cleanup
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
index 9b0526ff333d..7d1c68e637bd 100644
--- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2
TESTS_SUBDIRS= 1
diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile
index 1c6bad0b9779..734c7d8802a0 100644
--- a/usr.bin/bmake/tests/sysmk/t2/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2
TESTS_SUBDIRS= 2
diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
index 7aec6561e77a..f35c07c45829 100644
--- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
+++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk
-FILESDIR= ${TESTSDIR}
-FILES= sys.mk.test
-FILESNAME_sys.mk.test= sys.mk
+${PACKAGE}FILES+= sys.mk.test
+
+${PACKAGE}FILESNAME_sys.mk.test= sys.mk
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile
index 56615dfb0efe..e010718e65a4 100644
--- a/usr.bin/bmake/tests/variables/Makefile
+++ b/usr.bin/bmake/tests/variables/Makefile
@@ -1,8 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables
TESTS_SUBDIRS= modifier_M modifier_t opt_V t0
diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile
index 5841047477e5..f4bd3244edbe 100644
--- a/usr.bin/bmake/tests/variables/modifier_M/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile
index b35881a4afb6..364ff1198c38 100644
--- a/usr.bin/bmake/tests/variables/modifier_t/Makefile
+++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile
@@ -1,22 +1,20 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.status.3
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stderr.3
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
-FILES+= expected.stdout.3
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.status.3
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stderr.3
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
+${PACKAGE}FILES+= expected.stdout.3
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile
index f52507f202f4..cd9cb511bdfa 100644
--- a/usr.bin/bmake/tests/variables/opt_V/Makefile
+++ b/usr.bin/bmake/tests/variables/opt_V/Makefile
@@ -1,19 +1,17 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.status.2
-FILES+= expected.stderr.1
-FILES+= expected.stderr.2
-FILES+= expected.stdout.1
-FILES+= expected.stdout.2
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.status.2
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stderr.2
+${PACKAGE}FILES+= expected.stdout.1
+${PACKAGE}FILES+= expected.stdout.2
.include <bsd.test.mk>
diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile
index 4b845d71db75..50a8ff7bd59f 100644
--- a/usr.bin/bmake/tests/variables/t0/Makefile
+++ b/usr.bin/bmake/tests/variables/t0/Makefile
@@ -1,16 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= Makefile.test
-FILES+= expected.status.1
-FILES+= expected.stderr.1
-FILES+= expected.stdout.1
+${PACKAGE}FILES+= Makefile.test
+${PACKAGE}FILES+= expected.status.1
+${PACKAGE}FILES+= expected.stderr.1
+${PACKAGE}FILES+= expected.stdout.1
.include <bsd.test.mk>
diff --git a/usr.bin/calendar/tests/Makefile b/usr.bin/calendar/tests/Makefile
index a3bdadaef85f..4491e22aeb03 100644
--- a/usr.bin/calendar/tests/Makefile
+++ b/usr.bin/calendar/tests/Makefile
@@ -1,40 +1,38 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= calendar.calibrate
-FILES+= regress.a1.out
-FILES+= regress.a2.out
-FILES+= regress.a3.out
-FILES+= regress.a4.out
-FILES+= regress.a5.out
-FILES+= regress.b1.out
-FILES+= regress.b2.out
-FILES+= regress.b3.out
-FILES+= regress.b4.out
-FILES+= regress.b5.out
-FILES+= regress.s1.out
-FILES+= regress.s2.out
-FILES+= regress.s3.out
-FILES+= regress.s4.out
-FILES+= regress.sh
-FILES+= regress.w0-1.out
-FILES+= regress.w0-2.out
-FILES+= regress.w0-3.out
-FILES+= regress.w0-4.out
-FILES+= regress.w0-5.out
-FILES+= regress.w0-6.out
-FILES+= regress.w0-7.out
-FILES+= regress.wn-1.out
-FILES+= regress.wn-2.out
-FILES+= regress.wn-3.out
-FILES+= regress.wn-4.out
-FILES+= regress.wn-5.out
-FILES+= regress.wn-6.out
-FILES+= regress.wn-7.out
+${PACKAGE}FILES+= calendar.calibrate
+${PACKAGE}FILES+= regress.a1.out
+${PACKAGE}FILES+= regress.a2.out
+${PACKAGE}FILES+= regress.a3.out
+${PACKAGE}FILES+= regress.a4.out
+${PACKAGE}FILES+= regress.a5.out
+${PACKAGE}FILES+= regress.b1.out
+${PACKAGE}FILES+= regress.b2.out
+${PACKAGE}FILES+= regress.b3.out
+${PACKAGE}FILES+= regress.b4.out
+${PACKAGE}FILES+= regress.b5.out
+${PACKAGE}FILES+= regress.s1.out
+${PACKAGE}FILES+= regress.s2.out
+${PACKAGE}FILES+= regress.s3.out
+${PACKAGE}FILES+= regress.s4.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.w0-1.out
+${PACKAGE}FILES+= regress.w0-2.out
+${PACKAGE}FILES+= regress.w0-3.out
+${PACKAGE}FILES+= regress.w0-4.out
+${PACKAGE}FILES+= regress.w0-5.out
+${PACKAGE}FILES+= regress.w0-6.out
+${PACKAGE}FILES+= regress.w0-7.out
+${PACKAGE}FILES+= regress.wn-1.out
+${PACKAGE}FILES+= regress.wn-2.out
+${PACKAGE}FILES+= regress.wn-3.out
+${PACKAGE}FILES+= regress.wn-4.out
+${PACKAGE}FILES+= regress.wn-5.out
+${PACKAGE}FILES+= regress.wn-6.out
+${PACKAGE}FILES+= regress.wn-7.out
.include <bsd.test.mk>
diff --git a/usr.bin/cmp/tests/Makefile b/usr.bin/cmp/tests/Makefile
index 3e58b0097ed1..bfae46c8a2a4 100644
--- a/usr.bin/cmp/tests/Makefile
+++ b/usr.bin/cmp/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= cmp_test
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile
index b9fc67b1b2d1..43ae05b3dbcd 100644
--- a/usr.bin/col/tests/Makefile
+++ b/usr.bin/col/tests/Makefile
@@ -1,13 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= col
-FILES= rlf.in \
+${PACKAGE}FILES+= \
+ rlf.in \
rlf2.in
-FILESDIR= ${TESTSDIR}
.include <bsd.test.mk>
diff --git a/usr.bin/comm/tests/Makefile b/usr.bin/comm/tests/Makefile
index 90c34c050382..653ad229c7e6 100644
--- a/usr.bin/comm/tests/Makefile
+++ b/usr.bin/comm/tests/Makefile
@@ -1,21 +1,18 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.00.out
-FILES+= regress.00a.in
-FILES+= regress.00b.in
-FILES+= regress.01.out
-FILES+= regress.01a.in
-FILES+= regress.01b.in
-FILES+= regress.02.out
-FILES+= regress.02a.in
-FILES+= regress.02b.in
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.00.out
+${PACKAGE}FILES+= regress.00a.in
+${PACKAGE}FILES+= regress.00b.in
+${PACKAGE}FILES+= regress.01.out
+${PACKAGE}FILES+= regress.01a.in
+${PACKAGE}FILES+= regress.01b.in
+${PACKAGE}FILES+= regress.02.out
+${PACKAGE}FILES+= regress.02a.in
+${PACKAGE}FILES+= regress.02b.in
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile
index c65878f308bc..a2a3c11dec61 100644
--- a/usr.bin/cpio/tests/Makefile
+++ b/usr.bin/cpio/tests/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
@@ -91,27 +89,27 @@ list.h: ${TESTS_SRCS} Makefile
CLEANFILES+= list.h list.h.tmp
-FILES+= test_extract.cpio.Z.uu
-FILES+= test_extract.cpio.bz2.uu
-FILES+= test_extract.cpio.grz.uu
-FILES+= test_extract.cpio.gz.uu
-FILES+= test_extract.cpio.lrz.uu
-FILES+= test_extract.cpio.lz.uu
-FILES+= test_extract.cpio.lzma.uu
-FILES+= test_extract.cpio.lzo.uu
-FILES+= test_extract.cpio.xz.uu
-FILES+= test_gcpio_compat_ref.bin.uu
-FILES+= test_gcpio_compat_ref.crc.uu
-FILES+= test_gcpio_compat_ref.newc.uu
-FILES+= test_gcpio_compat_ref.ustar.uu
-FILES+= test_gcpio_compat_ref_nosym.bin.uu
-FILES+= test_gcpio_compat_ref_nosym.crc.uu
-FILES+= test_gcpio_compat_ref_nosym.newc.uu
-FILES+= test_gcpio_compat_ref_nosym.ustar.uu
-FILES+= test_option_f.cpio.uu
-FILES+= test_option_m.cpio.uu
-FILES+= test_option_t.cpio.uu
-FILES+= test_option_t.stdout.uu
-FILES+= test_option_tv.stdout.uu
+${PACKAGE}FILES+= test_extract.cpio.Z.uu
+${PACKAGE}FILES+= test_extract.cpio.bz2.uu
+${PACKAGE}FILES+= test_extract.cpio.grz.uu
+${PACKAGE}FILES+= test_extract.cpio.gz.uu
+${PACKAGE}FILES+= test_extract.cpio.lrz.uu
+${PACKAGE}FILES+= test_extract.cpio.lz.uu
+${PACKAGE}FILES+= test_extract.cpio.lzma.uu
+${PACKAGE}FILES+= test_extract.cpio.lzo.uu
+${PACKAGE}FILES+= test_extract.cpio.xz.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref.bin.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref.crc.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref.newc.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref.ustar.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.bin.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.crc.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.newc.uu
+${PACKAGE}FILES+= test_gcpio_compat_ref_nosym.ustar.uu
+${PACKAGE}FILES+= test_option_f.cpio.uu
+${PACKAGE}FILES+= test_option_m.cpio.uu
+${PACKAGE}FILES+= test_option_t.cpio.uu
+${PACKAGE}FILES+= test_option_t.stdout.uu
+${PACKAGE}FILES+= test_option_tv.stdout.uu
.include <bsd.test.mk>
diff --git a/usr.bin/cut/tests/Makefile b/usr.bin/cut/tests/Makefile
index 2491418c95f5..310994e0e617 100644
--- a/usr.bin/cut/tests/Makefile
+++ b/usr.bin/cut/tests/Makefile
@@ -1,21 +1,16 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
NETBSD_ATF_TESTS_SH= cut_test
-FILESDIR= ${TESTSDIR}
-FILES= d_basic.out
-FILES+= d_cut.in
-FILES+= d_dflag.out
-FILES+= d_dsflag.out
-FILES+= d_latin1.in
-FILES+= d_sflag.out
-FILES+= d_utf8.in
+${PACKAGE}FILES= d_basic.out
+${PACKAGE}FILES+= d_cut.in
+${PACKAGE}FILES+= d_dflag.out
+${PACKAGE}FILES+= d_dsflag.out
+${PACKAGE}FILES+= d_latin1.in
+${PACKAGE}FILES+= d_sflag.out
+${PACKAGE}FILES+= d_utf8.in
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/dirname/tests/Makefile b/usr.bin/dirname/tests/Makefile
index 28119f97d936..cc20dd399d43 100644
--- a/usr.bin/dirname/tests/Makefile
+++ b/usr.bin/dirname/tests/Makefile
@@ -1,11 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= dirname_test
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/file2c/tests/Makefile b/usr.bin/file2c/tests/Makefile
index 83feec215a81..a35406bd47a0 100644
--- a/usr.bin/file2c/tests/Makefile
+++ b/usr.bin/file2c/tests/Makefile
@@ -1,22 +1,19 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.1.out
-FILES+= regress.2.out
-FILES+= regress.3.out
-FILES+= regress.4.out
-FILES+= regress.5.out
-FILES+= regress.6.out
-FILES+= regress.7.out
-FILES+= regress.8.out
-FILES+= regress.9.out
-FILES+= regress.in
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.1.out
+${PACKAGE}FILES+= regress.2.out
+${PACKAGE}FILES+= regress.3.out
+${PACKAGE}FILES+= regress.4.out
+${PACKAGE}FILES+= regress.5.out
+${PACKAGE}FILES+= regress.6.out
+${PACKAGE}FILES+= regress.7.out
+${PACKAGE}FILES+= regress.8.out
+${PACKAGE}FILES+= regress.9.out
+${PACKAGE}FILES+= regress.in
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/grep/tests/Makefile b/usr.bin/grep/tests/Makefile
index 945af136beb6..041259b0144e 100644
--- a/usr.bin/grep/tests/Makefile
+++ b/usr.bin/grep/tests/Makefile
@@ -1,40 +1,35 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
NETBSD_ATF_TESTS_SH= grep_test
-FILESDIR= ${TESTSDIR}
-FILES= d_basic.out
-FILES+= d_begin_end_a.out
-FILES+= d_begin_end_b.out
-FILES+= d_binary.out
-FILES+= d_context2_a.out
-FILES+= d_context2_b.out
-FILES+= d_context2_c.out
-FILES+= d_context_a.in
-FILES+= d_context_a.out
-FILES+= d_context_b.in
-FILES+= d_context_b.out
-FILES+= d_context_c.out
-FILES+= d_context_d.out
-FILES+= d_egrep.out
-FILES+= d_file_exp.in
-FILES+= d_file_exp.out
-FILES+= d_ignore_case.out
-FILES+= d_input
-FILES+= d_invert.in
-FILES+= d_invert.out
-FILES+= d_recurse.out
-FILES+= d_recurse_symlink.err
-FILES+= d_recurse_symlink.out
-FILES+= d_whole_line.out
-FILES+= d_word_regexps.out
-FILES+= d_zgrep.out
+${PACKAGE}FILES+= d_basic.out
+${PACKAGE}FILES+= d_begin_end_a.out
+${PACKAGE}FILES+= d_begin_end_b.out
+${PACKAGE}FILES+= d_binary.out
+${PACKAGE}FILES+= d_context2_a.out
+${PACKAGE}FILES+= d_context2_b.out
+${PACKAGE}FILES+= d_context2_c.out
+${PACKAGE}FILES+= d_context_a.in
+${PACKAGE}FILES+= d_context_a.out
+${PACKAGE}FILES+= d_context_b.in
+${PACKAGE}FILES+= d_context_b.out
+${PACKAGE}FILES+= d_context_c.out
+${PACKAGE}FILES+= d_context_d.out
+${PACKAGE}FILES+= d_egrep.out
+${PACKAGE}FILES+= d_file_exp.in
+${PACKAGE}FILES+= d_file_exp.out
+${PACKAGE}FILES+= d_ignore_case.out
+${PACKAGE}FILES+= d_input
+${PACKAGE}FILES+= d_invert.in
+${PACKAGE}FILES+= d_invert.out
+${PACKAGE}FILES+= d_recurse.out
+${PACKAGE}FILES+= d_recurse_symlink.err
+${PACKAGE}FILES+= d_recurse_symlink.out
+${PACKAGE}FILES+= d_whole_line.out
+${PACKAGE}FILES+= d_word_regexps.out
+${PACKAGE}FILES+= d_zgrep.out
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/gzip/tests/Makefile b/usr.bin/gzip/tests/Makefile
index 96acbd231e63..03a5852b3ff0 100644
--- a/usr.bin/gzip/tests/Makefile
+++ b/usr.bin/gzip/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
NETBSD_ATF_TESTS_SH= gzip_test
.include <netbsd-tests.test.mk>
diff --git a/usr.bin/ident/tests/Makefile b/usr.bin/ident/tests/Makefile
index e38eb1036a1a..a1c6449114cd 100644
--- a/usr.bin/ident/tests/Makefile
+++ b/usr.bin/ident/tests/Makefile
@@ -1,13 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= ident
-FILES= test.in \
+${PACKAGE}FILES+= \
+ test.in \
test.out \
testnoid
-FILESDIR= ${TESTSDIR}
.include <bsd.test.mk>
diff --git a/usr.bin/join/tests/Makefile b/usr.bin/join/tests/Makefile
index 369be0a6e234..46c83e364ae4 100644
--- a/usr.bin/join/tests/Makefile
+++ b/usr.bin/join/tests/Makefile
@@ -1,15 +1,12 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.1.in
-FILES+= regress.2.in
-FILES+= regress.out
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.1.in
+${PACKAGE}FILES+= regress.2.in
+${PACKAGE}FILES+= regress.out
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/jot/tests/Makefile b/usr.bin/jot/tests/Makefile
index c85b4a132000..10e102bd8490 100644
--- a/usr.bin/jot/tests/Makefile
+++ b/usr.bin/jot/tests/Makefile
@@ -1,73 +1,70 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.ascii.out
-FILES+= regress.block.out
-FILES+= regress.dddd.out
-FILES+= regress.dddh.out
-FILES+= regress.ddhd.out
-FILES+= regress.ddhd2.out
-FILES+= regress.ddhh.out
-FILES+= regress.ddhh2.out
-FILES+= regress.dhdd.out
-FILES+= regress.dhdh.out
-FILES+= regress.dhhd.out
-FILES+= regress.dhhd2.out
-FILES+= regress.dhhh.out
-FILES+= regress.dhhh2.out
-FILES+= regress.ed.out
-FILES+= regress.grep.out
-FILES+= regress.hddd.out
-FILES+= regress.hddd2.out
-FILES+= regress.hddh.out
-FILES+= regress.hddh2.out
-FILES+= regress.hdhd.out
-FILES+= regress.hdhd2.out
-FILES+= regress.hdhh.out
-FILES+= regress.hdhh2.out
-FILES+= regress.hhdd.out
-FILES+= regress.hhdd2.out
-FILES+= regress.hhdh.out
-FILES+= regress.hhdh2.out
-FILES+= regress.hhhd.out
-FILES+= regress.hhhd2.out
-FILES+= regress.hhhh.out
-FILES+= regress.hhhh2.out
-FILES+= regress.n21.out
-FILES+= regress.rand1.out
-FILES+= regress.rand2.out
-FILES+= regress.sh
-FILES+= regress.stutter.out
-FILES+= regress.stutter2.out
-FILES+= regress.tabs.out
-FILES+= regress.wX1.out
-FILES+= regress.wXl.out
-FILES+= regress.wc.out
-FILES+= regress.wdl.out
-FILES+= regress.wdn.out
-FILES+= regress.we.out
-FILES+= regress.wf.out
-FILES+= regress.wg.out
-FILES+= regress.wgd.out
-FILES+= regress.wo.out
-FILES+= regress.wp1.out
-FILES+= regress.wp2.out
-FILES+= regress.wp3.out
-FILES+= regress.wp4.out
-FILES+= regress.wp5.out
-FILES+= regress.wp6.out
-FILES+= regress.wu.out
-FILES+= regress.wwe.out
-FILES+= regress.wx.out
-FILES+= regress.wxn.out
-FILES+= regress.x.out
-FILES+= regress.xaa.out
-FILES+= regress.yes.out
+${PACKAGE}FILES+= regress.ascii.out
+${PACKAGE}FILES+= regress.block.out
+${PACKAGE}FILES+= regress.dddd.out
+${PACKAGE}FILES+= regress.dddh.out
+${PACKAGE}FILES+= regress.ddhd.out
+${PACKAGE}FILES+= regress.ddhd2.out
+${PACKAGE}FILES+= regress.ddhh.out
+${PACKAGE}FILES+= regress.ddhh2.out
+${PACKAGE}FILES+= regress.dhdd.out
+${PACKAGE}FILES+= regress.dhdh.out
+${PACKAGE}FILES+= regress.dhhd.out
+${PACKAGE}FILES+= regress.dhhd2.out
+${PACKAGE}FILES+= regress.dhhh.out
+${PACKAGE}FILES+= regress.dhhh2.out
+${PACKAGE}FILES+= regress.ed.out
+${PACKAGE}FILES+= regress.grep.out
+${PACKAGE}FILES+= regress.hddd.out
+${PACKAGE}FILES+= regress.hddd2.out
+${PACKAGE}FILES+= regress.hddh.out
+${PACKAGE}FILES+= regress.hddh2.out
+${PACKAGE}FILES+= regress.hdhd.out
+${PACKAGE}FILES+= regress.hdhd2.out
+${PACKAGE}FILES+= regress.hdhh.out
+${PACKAGE}FILES+= regress.hdhh2.out
+${PACKAGE}FILES+= regress.hhdd.out
+${PACKAGE}FILES+= regress.hhdd2.out
+${PACKAGE}FILES+= regress.hhdh.out
+${PACKAGE}FILES+= regress.hhdh2.out
+${PACKAGE}FILES+= regress.hhhd.out
+${PACKAGE}FILES+= regress.hhhd2.out
+${PACKAGE}FILES+= regress.hhhh.out
+${PACKAGE}FILES+= regress.hhhh2.out
+${PACKAGE}FILES+= regress.n21.out
+${PACKAGE}FILES+= regress.rand1.out
+${PACKAGE}FILES+= regress.rand2.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.stutter.out
+${PACKAGE}FILES+= regress.stutter2.out
+${PACKAGE}FILES+= regress.tabs.out
+${PACKAGE}FILES+= regress.wX1.out
+${PACKAGE}FILES+= regress.wXl.out
+${PACKAGE}FILES+= regress.wc.out
+${PACKAGE}FILES+= regress.wdl.out
+${PACKAGE}FILES+= regress.wdn.out
+${PACKAGE}FILES+= regress.we.out
+${PACKAGE}FILES+= regress.wf.out
+${PACKAGE}FILES+= regress.wg.out
+${PACKAGE}FILES+= regress.wgd.out
+${PACKAGE}FILES+= regress.wo.out
+${PACKAGE}FILES+= regress.wp1.out
+${PACKAGE}FILES+= regress.wp2.out
+${PACKAGE}FILES+= regress.wp3.out
+${PACKAGE}FILES+= regress.wp4.out
+${PACKAGE}FILES+= regress.wp5.out
+${PACKAGE}FILES+= regress.wp6.out
+${PACKAGE}FILES+= regress.wu.out
+${PACKAGE}FILES+= regress.wwe.out
+${PACKAGE}FILES+= regress.wx.out
+${PACKAGE}FILES+= regress.wxn.out
+${PACKAGE}FILES+= regress.x.out
+${PACKAGE}FILES+= regress.xaa.out
+${PACKAGE}FILES+= regress.yes.out
.include <bsd.test.mk>
diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile
index 71fe66e7b8e3..3aa4b752e112 100644
--- a/usr.bin/lastcomm/tests/Makefile
+++ b/usr.bin/lastcomm/tests/Makefile
@@ -1,23 +1,20 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= v1-amd64-acct.in
-FILES+= v1-amd64.out
-FILES+= v1-i386-acct.in
-FILES+= v1-i386.out
-FILES+= v1-sparc64-acct.in
-FILES+= v1-sparc64.out
-FILES+= v2-amd64-acct.in
-FILES+= v2-amd64.out
-FILES+= v2-i386-acct.in
-FILES+= v2-i386.out
-FILES+= v2-sparc64-acct.in
-FILES+= v2-sparc64.out
+${PACKAGE}FILES+= v1-amd64-acct.in
+${PACKAGE}FILES+= v1-amd64.out
+${PACKAGE}FILES+= v1-i386-acct.in
+${PACKAGE}FILES+= v1-i386.out
+${PACKAGE}FILES+= v1-sparc64-acct.in
+${PACKAGE}FILES+= v1-sparc64.out
+${PACKAGE}FILES+= v2-amd64-acct.in
+${PACKAGE}FILES+= v2-amd64.out
+${PACKAGE}FILES+= v2-i386-acct.in
+${PACKAGE}FILES+= v2-i386.out
+${PACKAGE}FILES+= v2-sparc64-acct.in
+${PACKAGE}FILES+= v2-sparc64.out
.include <bsd.test.mk>
diff --git a/usr.bin/limits/tests/Makefile b/usr.bin/limits/tests/Makefile
index e57fe6015a2c..54bf8921a27f 100644
--- a/usr.bin/limits/tests/Makefile
+++ b/usr.bin/limits/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH+= limits_test
.include <bsd.test.mk>
diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile
index 24b453a2f472..c3002f6cc79d 100644
--- a/usr.bin/m4/tests/Makefile
+++ b/usr.bin/m4/tests/Makefile
@@ -1,54 +1,51 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= args.m4
-FILES+= args2.m4
-FILES+= comments.m4
-FILES+= esyscmd.m4
-FILES+= eval.m4
-FILES+= ff_after_dnl.m4.uu
-FILES+= gnueval.m4
-FILES+= gnuformat.m4
-FILES+= gnupatterns.m4
-FILES+= gnupatterns2.m4
-FILES+= gnuprefix.m4
-FILES+= gnusofterror.m4
-FILES+= includes.aux
-FILES+= includes.m4
-FILES+= m4wrap3.m4
-FILES+= patterns.m4
-FILES+= quotes.m4
-FILES+= redef.m4
-FILES+= regress.args.out
-FILES+= regress.args2.out
-FILES+= regress.comments.out
-FILES+= regress.esyscmd.out
-FILES+= regress.eval.out
-FILES+= regress.ff_after_dnl.out
-FILES+= regress.gnueval.out
-FILES+= regress.gnuformat.out
-FILES+= regress.gnupatterns.out
-FILES+= regress.gnupatterns2.out
-FILES+= regress.gnuprefix.out
-FILES+= regress.gnusofterror.out
-FILES+= regress.gnutranslit2.out
-FILES+= regress.includes.out
-FILES+= regress.m4wrap3.out
-FILES+= regress.patterns.out
-FILES+= regress.quotes.out
-FILES+= regress.redef.out
-FILES+= regress.sh
-FILES+= regress.strangequotes.out
-FILES+= regress.translit.out
-FILES+= regress.translit2.out
-FILES+= strangequotes.m4.uu
-FILES+= translit.m4
-FILES+= translit2.m4
+${PACKAGE}FILES+= args.m4
+${PACKAGE}FILES+= args2.m4
+${PACKAGE}FILES+= comments.m4
+${PACKAGE}FILES+= esyscmd.m4
+${PACKAGE}FILES+= eval.m4
+${PACKAGE}FILES+= ff_after_dnl.m4.uu
+${PACKAGE}FILES+= gnueval.m4
+${PACKAGE}FILES+= gnuformat.m4
+${PACKAGE}FILES+= gnupatterns.m4
+${PACKAGE}FILES+= gnupatterns2.m4
+${PACKAGE}FILES+= gnuprefix.m4
+${PACKAGE}FILES+= gnusofterror.m4
+${PACKAGE}FILES+= includes.aux
+${PACKAGE}FILES+= includes.m4
+${PACKAGE}FILES+= m4wrap3.m4
+${PACKAGE}FILES+= patterns.m4
+${PACKAGE}FILES+= quotes.m4
+${PACKAGE}FILES+= redef.m4
+${PACKAGE}FILES+= regress.args.out
+${PACKAGE}FILES+= regress.args2.out
+${PACKAGE}FILES+= regress.comments.out
+${PACKAGE}FILES+= regress.esyscmd.out
+${PACKAGE}FILES+= regress.eval.out
+${PACKAGE}FILES+= regress.ff_after_dnl.out
+${PACKAGE}FILES+= regress.gnueval.out
+${PACKAGE}FILES+= regress.gnuformat.out
+${PACKAGE}FILES+= regress.gnupatterns.out
+${PACKAGE}FILES+= regress.gnupatterns2.out
+${PACKAGE}FILES+= regress.gnuprefix.out
+${PACKAGE}FILES+= regress.gnusofterror.out
+${PACKAGE}FILES+= regress.gnutranslit2.out
+${PACKAGE}FILES+= regress.includes.out
+${PACKAGE}FILES+= regress.m4wrap3.out
+${PACKAGE}FILES+= regress.patterns.out
+${PACKAGE}FILES+= regress.quotes.out
+${PACKAGE}FILES+= regress.redef.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.strangequotes.out
+${PACKAGE}FILES+= regress.translit.out
+${PACKAGE}FILES+= regress.translit2.out
+${PACKAGE}FILES+= strangequotes.m4.uu
+${PACKAGE}FILES+= translit.m4
+${PACKAGE}FILES+= translit2.m4
.include <bsd.test.mk>
diff --git a/usr.bin/mkimg/tests/Makefile b/usr.bin/mkimg/tests/Makefile
index b98da39c8eee..321a5a64b09e 100644
--- a/usr.bin/mkimg/tests/Makefile
+++ b/usr.bin/mkimg/tests/Makefile
@@ -1,19 +1,16 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= mkimg
SOURCES!= cd ${.CURDIR}; echo *.uu
-FILES= ${SOURCES:S,.gz.uu,,g}
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= ${SOURCES:S,.gz.uu,,g}
-${FILES}:
+${${PACKAGE}FILES}:
uudecode -p ${.CURDIR}/${.TARGET}.gz.uu | gunzip -c > ${.TARGET}
-CLEANFILES+= ${FILES}
+CLEANFILES+= ${${PACKAGE}FILES}}
rebase:
(cd ${.CURDIR}; atf-sh mkimg.sh rebase)
diff --git a/usr.bin/ncal/tests/Makefile b/usr.bin/ncal/tests/Makefile
index 8752f77d5875..404f512c72a2 100644
--- a/usr.bin/ncal/tests/Makefile
+++ b/usr.bin/ncal/tests/Makefile
@@ -1,101 +1,98 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.b-3m200901-jd-nhl.out
-FILES+= regress.b-3m200901-md-nhl.out
-FILES+= regress.b-3m200902-jd-nhl.out
-FILES+= regress.b-3m200902-md-nhl.out
-FILES+= regress.b-3m200903-jd-nhl.out
-FILES+= regress.b-3m200903-md-nhl.out
-FILES+= regress.b-3m200904-jd-nhl.out
-FILES+= regress.b-3m200904-md-nhl.out
-FILES+= regress.b-3m200905-jd-nhl.out
-FILES+= regress.b-3m200905-md-nhl.out
-FILES+= regress.b-3m200906-jd-nhl.out
-FILES+= regress.b-3m200906-md-nhl.out
-FILES+= regress.b-3m200907-jd-nhl.out
-FILES+= regress.b-3m200907-md-nhl.out
-FILES+= regress.b-3m200908-jd-nhl.out
-FILES+= regress.b-3m200908-md-nhl.out
-FILES+= regress.b-3m200909-jd-nhl.out
-FILES+= regress.b-3m200909-md-nhl.out
-FILES+= regress.b-3m200910-jd-nhl.out
-FILES+= regress.b-3m200910-md-nhl.out
-FILES+= regress.b-3m200911-jd-nhl.out
-FILES+= regress.b-3m200911-md-nhl.out
-FILES+= regress.b-3m200912-jd-nhl.out
-FILES+= regress.b-3m200912-md-nhl.out
-FILES+= regress.b-y2008-jd-nhl.out
-FILES+= regress.b-y2008-md-nhl.out
-FILES+= regress.b-y2009-jd-nhl.out
-FILES+= regress.b-y2009-md-nhl.out
-FILES+= regress.b-y2010-jd-nhl.out
-FILES+= regress.b-y2010-md-nhl.out
-FILES+= regress.b-y2011-jd-nhl.out
-FILES+= regress.b-y2011-md-nhl.out
-FILES+= regress.f-3A-nhl.out
-FILES+= regress.f-3AB-nhl.out
-FILES+= regress.f-3B-nhl.out
-FILES+= regress.f-3gy-nhl.out
-FILES+= regress.f-3y-nhl.out
-FILES+= regress.f-mgm-nhl.out
-FILES+= regress.f-yA-nhl.out
-FILES+= regress.f-yAB-nhl.out
-FILES+= regress.f-yB-nhl.out
-FILES+= regress.f-ygm-nhl.out
-FILES+= regress.f-ym-nhl.out
-FILES+= regress.r-3m200901-jd-nhl.out
-FILES+= regress.r-3m200901-md-nhl.out
-FILES+= regress.r-3m200902-jd-nhl.out
-FILES+= regress.r-3m200902-md-nhl.out
-FILES+= regress.r-3m200903-jd-nhl.out
-FILES+= regress.r-3m200903-md-nhl.out
-FILES+= regress.r-3m200904-jd-nhl.out
-FILES+= regress.r-3m200904-md-nhl.out
-FILES+= regress.r-3m200905-jd-nhl.out
-FILES+= regress.r-3m200905-md-nhl.out
-FILES+= regress.r-3m200906-jd-nhl.out
-FILES+= regress.r-3m200906-md-nhl.out
-FILES+= regress.r-3m200907-jd-nhl.out
-FILES+= regress.r-3m200907-md-nhl.out
-FILES+= regress.r-3m200908-jd-nhl.out
-FILES+= regress.r-3m200908-md-nhl.out
-FILES+= regress.r-3m200909-jd-nhl.out
-FILES+= regress.r-3m200909-md-nhl.out
-FILES+= regress.r-3m200910-jd-nhl.out
-FILES+= regress.r-3m200910-md-nhl.out
-FILES+= regress.r-3m200911-jd-nhl.out
-FILES+= regress.r-3m200911-md-nhl.out
-FILES+= regress.r-3m200912-jd-nhl.out
-FILES+= regress.r-3m200912-md-nhl.out
-FILES+= regress.r-y2008-jd-nhl.out
-FILES+= regress.r-y2008-md-nhl.out
-FILES+= regress.r-y2009-jd-nhl.out
-FILES+= regress.r-y2009-md-nhl.out
-FILES+= regress.r-y2010-jd-nhl.out
-FILES+= regress.r-y2010-md-nhl.out
-FILES+= regress.r-y2011-jd-nhl.out
-FILES+= regress.r-y2011-md-nhl.out
-FILES+= regress.s-b-3-nhl.out
-FILES+= regress.s-b-A-nhl.out
-FILES+= regress.s-b-AB-nhl.out
-FILES+= regress.s-b-B-nhl.out
-FILES+= regress.s-b-gmgy-nhl.out
-FILES+= regress.s-b-m-nhl.out
-FILES+= regress.s-b-mgy-nhl.out
-FILES+= regress.s-r-3-nhl.out
-FILES+= regress.s-r-A-nhl.out
-FILES+= regress.s-r-AB-nhl.out
-FILES+= regress.s-r-B-nhl.out
-FILES+= regress.s-r-gmgy-nhl.out
-FILES+= regress.s-r-m-nhl.out
-FILES+= regress.s-r-mgy-nhl.out
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.b-3m200901-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200901-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200902-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200902-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200903-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200903-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200904-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200904-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200905-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200905-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200906-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200906-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200907-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200907-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200908-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200908-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200909-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200909-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200910-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200910-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200911-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200911-md-nhl.out
+${PACKAGE}FILES+= regress.b-3m200912-jd-nhl.out
+${PACKAGE}FILES+= regress.b-3m200912-md-nhl.out
+${PACKAGE}FILES+= regress.b-y2008-jd-nhl.out
+${PACKAGE}FILES+= regress.b-y2008-md-nhl.out
+${PACKAGE}FILES+= regress.b-y2009-jd-nhl.out
+${PACKAGE}FILES+= regress.b-y2009-md-nhl.out
+${PACKAGE}FILES+= regress.b-y2010-jd-nhl.out
+${PACKAGE}FILES+= regress.b-y2010-md-nhl.out
+${PACKAGE}FILES+= regress.b-y2011-jd-nhl.out
+${PACKAGE}FILES+= regress.b-y2011-md-nhl.out
+${PACKAGE}FILES+= regress.f-3A-nhl.out
+${PACKAGE}FILES+= regress.f-3AB-nhl.out
+${PACKAGE}FILES+= regress.f-3B-nhl.out
+${PACKAGE}FILES+= regress.f-3gy-nhl.out
+${PACKAGE}FILES+= regress.f-3y-nhl.out
+${PACKAGE}FILES+= regress.f-mgm-nhl.out
+${PACKAGE}FILES+= regress.f-yA-nhl.out
+${PACKAGE}FILES+= regress.f-yAB-nhl.out
+${PACKAGE}FILES+= regress.f-yB-nhl.out
+${PACKAGE}FILES+= regress.f-ygm-nhl.out
+${PACKAGE}FILES+= regress.f-ym-nhl.out
+${PACKAGE}FILES+= regress.r-3m200901-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200901-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200902-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200902-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200903-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200903-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200904-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200904-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200905-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200905-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200906-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200906-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200907-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200907-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200908-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200908-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200909-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200909-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200910-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200910-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200911-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200911-md-nhl.out
+${PACKAGE}FILES+= regress.r-3m200912-jd-nhl.out
+${PACKAGE}FILES+= regress.r-3m200912-md-nhl.out
+${PACKAGE}FILES+= regress.r-y2008-jd-nhl.out
+${PACKAGE}FILES+= regress.r-y2008-md-nhl.out
+${PACKAGE}FILES+= regress.r-y2009-jd-nhl.out
+${PACKAGE}FILES+= regress.r-y2009-md-nhl.out
+${PACKAGE}FILES+= regress.r-y2010-jd-nhl.out
+${PACKAGE}FILES+= regress.r-y2010-md-nhl.out
+${PACKAGE}FILES+= regress.r-y2011-jd-nhl.out
+${PACKAGE}FILES+= regress.r-y2011-md-nhl.out
+${PACKAGE}FILES+= regress.s-b-3-nhl.out
+${PACKAGE}FILES+= regress.s-b-A-nhl.out
+${PACKAGE}FILES+= regress.s-b-AB-nhl.out
+${PACKAGE}FILES+= regress.s-b-B-nhl.out
+${PACKAGE}FILES+= regress.s-b-gmgy-nhl.out
+${PACKAGE}FILES+= regress.s-b-m-nhl.out
+${PACKAGE}FILES+= regress.s-b-mgy-nhl.out
+${PACKAGE}FILES+= regress.s-r-3-nhl.out
+${PACKAGE}FILES+= regress.s-r-A-nhl.out
+${PACKAGE}FILES+= regress.s-r-AB-nhl.out
+${PACKAGE}FILES+= regress.s-r-B-nhl.out
+${PACKAGE}FILES+= regress.s-r-gmgy-nhl.out
+${PACKAGE}FILES+= regress.s-r-m-nhl.out
+${PACKAGE}FILES+= regress.s-r-mgy-nhl.out
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/printf/tests/Makefile b/usr.bin/printf/tests/Makefile
index 9217881b1d2d..04b43fd3ae53 100644
--- a/usr.bin/printf/tests/Makefile
+++ b/usr.bin/printf/tests/Makefile
@@ -1,25 +1,22 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.b.out
-FILES+= regress.d.out
-FILES+= regress.f.out
-FILES+= regress.l1.out
-FILES+= regress.l2.out
-FILES+= regress.m1.out
-FILES+= regress.m2.out
-FILES+= regress.m3.out
-FILES+= regress.m4.out
-FILES+= regress.m5.out
-FILES+= regress.missingpos1.out
-FILES+= regress.s.out
-FILES+= regress.sh
-FILES+= regress.zero.out
+${PACKAGE}FILES+= regress.b.out
+${PACKAGE}FILES+= regress.d.out
+${PACKAGE}FILES+= regress.f.out
+${PACKAGE}FILES+= regress.l1.out
+${PACKAGE}FILES+= regress.l2.out
+${PACKAGE}FILES+= regress.m1.out
+${PACKAGE}FILES+= regress.m2.out
+${PACKAGE}FILES+= regress.m3.out
+${PACKAGE}FILES+= regress.m4.out
+${PACKAGE}FILES+= regress.m5.out
+${PACKAGE}FILES+= regress.missingpos1.out
+${PACKAGE}FILES+= regress.s.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.zero.out
.include <bsd.test.mk>
diff --git a/usr.bin/sdiff/tests/Makefile b/usr.bin/sdiff/tests/Makefile
index 2c0b916bb9e1..b01c3b6cc4ee 100644
--- a/usr.bin/sdiff/tests/Makefile
+++ b/usr.bin/sdiff/tests/Makefile
@@ -1,14 +1,11 @@
# $FreeBSD$
PACKAGE= tests
-FILEGROUPS= TESTS
-TESTPACKAGE= ${PACKAGE}
-TESTDIR= ${TESTSBASE}/usr.bin/sdiff
ATF_TESTS_SH= sdiff
-FILESDIR= ${TESTDIR}
-FILES= d_dot.in \
+${PACKAGE}FILES+= \
+ d_dot.in \
d_flags_l.out \
d_flags_s.out \
d_flags_w.out \
diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile
index eaeaa43c24a3..0d017e1299ef 100644
--- a/usr.bin/sed/tests/Makefile
+++ b/usr.bin/sed/tests/Makefile
@@ -1,40 +1,37 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
TAP_TESTS_SH+= multi_test
TEST_METADATA.multi_test+= required_files="/usr/share/dict/words"
TAP_TESTS_SH+= inplace_race_test
-FILESDIR= ${TESTSDIR}
-FILES= hanoi.sed
-FILES+= math.sed
-FILES+= regress.G.out
-FILES+= regress.P.out
-FILES+= regress.b2a.out
-FILES+= regress.bcb.out
-FILES+= regress.c0.out
-FILES+= regress.c1.out
-FILES+= regress.c2.out
-FILES+= regress.c3.out
-FILES+= regress.hanoi.out
-FILES+= regress.icase1.out
-FILES+= regress.icase2.out
-FILES+= regress.icase3.out
-FILES+= regress.icase4.out
-FILES+= regress.in
-FILES+= regress.math.out
-FILES+= regress.not.out
-FILES+= regress.psl.out
-FILES+= regress.s3.out
-FILES+= regress.s4.out
-FILES+= regress.s5.out
-FILES+= regress.sg.out
-FILES+= regress.sh
-FILES+= regress.y.out
+${PACKAGE}FILES+= hanoi.sed
+${PACKAGE}FILES+= math.sed
+${PACKAGE}FILES+= regress.G.out
+${PACKAGE}FILES+= regress.P.out
+${PACKAGE}FILES+= regress.b2a.out
+${PACKAGE}FILES+= regress.bcb.out
+${PACKAGE}FILES+= regress.c0.out
+${PACKAGE}FILES+= regress.c1.out
+${PACKAGE}FILES+= regress.c2.out
+${PACKAGE}FILES+= regress.c3.out
+${PACKAGE}FILES+= regress.hanoi.out
+${PACKAGE}FILES+= regress.icase1.out
+${PACKAGE}FILES+= regress.icase2.out
+${PACKAGE}FILES+= regress.icase3.out
+${PACKAGE}FILES+= regress.icase4.out
+${PACKAGE}FILES+= regress.in
+${PACKAGE}FILES+= regress.math.out
+${PACKAGE}FILES+= regress.not.out
+${PACKAGE}FILES+= regress.psl.out
+${PACKAGE}FILES+= regress.s3.out
+${PACKAGE}FILES+= regress.s4.out
+${PACKAGE}FILES+= regress.s5.out
+${PACKAGE}FILES+= regress.sg.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.y.out
SUBDIR= regress.multitest.out
diff --git a/usr.bin/sed/tests/regress.multitest.out/Makefile b/usr.bin/sed/tests/regress.multitest.out/Makefile
index f3fb038ad021..aecb6eaf9877 100644
--- a/usr.bin/sed/tests/regress.multitest.out/Makefile
+++ b/usr.bin/sed/tests/regress.multitest.out/Makefile
@@ -1,139 +1,137 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSDIR= ${TESTSBASE}/usr.bin/sed/regress.multitest.out
-FILESDIR= ${TESTSDIR}
-FILES= 1.1
-FILES+= 1.10
-FILES+= 1.11
-FILES+= 1.12
-FILES+= 1.13
-FILES+= 1.14
-FILES+= 1.15
-FILES+= 1.16
-FILES+= 1.17
-FILES+= 1.18
-FILES+= 1.2
-FILES+= 1.3
-FILES+= 1.4
-FILES+= 1.4.1
-FILES+= 1.5
-FILES+= 1.6
-FILES+= 1.7
-FILES+= 1.8
-FILES+= 1.9
-FILES+= 2.1
-FILES+= 2.10
-FILES+= 2.11
-FILES+= 2.12
-FILES+= 2.13
-FILES+= 2.14
-FILES+= 2.15
-FILES+= 2.16
-FILES+= 2.17
-FILES+= 2.18
-FILES+= 2.19
-FILES+= 2.2
-FILES+= 2.20
-FILES+= 2.21
-FILES+= 2.22
-FILES+= 2.3
-FILES+= 2.4
-FILES+= 2.5
-FILES+= 2.6
-FILES+= 2.7
-FILES+= 2.8
-FILES+= 2.9
-FILES+= 3.1
-FILES+= 3.2
-FILES+= 3.3
-FILES+= 3.4
-FILES+= 4.1
-FILES+= 4.2
-FILES+= 4.3
-FILES+= 4.4
-FILES+= 4.5
-FILES+= 4.6
-FILES+= 4.7
-FILES+= 4.8
-FILES+= 5.1
-FILES+= 5.2
-FILES+= 5.3
-FILES+= 5.4
-FILES+= 5.5
-FILES+= 5.6
-FILES+= 5.7
-FILES+= 5.8
-FILES+= 6.1
-FILES+= 6.2
-FILES+= 6.3
-FILES+= 6.4
-FILES+= 6.5
-FILES+= 6.6
-FILES+= 7.1
-FILES+= 7.2
-FILES+= 7.3
-FILES+= 7.4
-FILES+= 7.5
-FILES+= 7.6
-FILES+= 7.7
-FILES+= 7.8
-FILES+= 8.1
-FILES+= 8.10
-FILES+= 8.11
-FILES+= 8.12
-FILES+= 8.13
-FILES+= 8.14
-FILES+= 8.15
-FILES+= 8.16
-FILES+= 8.17
-FILES+= 8.18
-FILES+= 8.19
-FILES+= 8.2
-FILES+= 8.20
-FILES+= 8.21
-FILES+= 8.22
-FILES+= 8.23
-FILES+= 8.3
-FILES+= 8.4
-FILES+= 8.5
-FILES+= 8.6
-FILES+= 8.7
-FILES+= 8.8
-FILES+= 8.9
-FILES+= 9.1
-FILES+= 9.10
-FILES+= 9.11
-FILES+= 9.12
-FILES+= 9.13
-FILES+= 9.14
-FILES+= 9.15
-FILES+= 9.16
-FILES+= 9.17
-FILES+= 9.18
-FILES+= 9.19
-FILES+= 9.2
-FILES+= 9.20
-FILES+= 9.21
-FILES+= 9.22
-FILES+= 9.23
-FILES+= 9.24
-FILES+= 9.25
-FILES+= 9.26
-FILES+= 9.27
-FILES+= 9.28
-FILES+= 9.29
-FILES+= 9.3
-FILES+= 9.30
-FILES+= 9.31
-FILES+= 9.4
-FILES+= 9.5
-FILES+= 9.6
-FILES+= 9.7
-FILES+= 9.8
-FILES+= 9.9
+${PACKAGE}FILES+= 1.1
+${PACKAGE}FILES+= 1.10
+${PACKAGE}FILES+= 1.11
+${PACKAGE}FILES+= 1.12
+${PACKAGE}FILES+= 1.13
+${PACKAGE}FILES+= 1.14
+${PACKAGE}FILES+= 1.15
+${PACKAGE}FILES+= 1.16
+${PACKAGE}FILES+= 1.17
+${PACKAGE}FILES+= 1.18
+${PACKAGE}FILES+= 1.2
+${PACKAGE}FILES+= 1.3
+${PACKAGE}FILES+= 1.4
+${PACKAGE}FILES+= 1.4.1
+${PACKAGE}FILES+= 1.5
+${PACKAGE}FILES+= 1.6
+${PACKAGE}FILES+= 1.7
+${PACKAGE}FILES+= 1.8
+${PACKAGE}FILES+= 1.9
+${PACKAGE}FILES+= 2.1
+${PACKAGE}FILES+= 2.10
+${PACKAGE}FILES+= 2.11
+${PACKAGE}FILES+= 2.12
+${PACKAGE}FILES+= 2.13
+${PACKAGE}FILES+= 2.14
+${PACKAGE}FILES+= 2.15
+${PACKAGE}FILES+= 2.16
+${PACKAGE}FILES+= 2.17
+${PACKAGE}FILES+= 2.18
+${PACKAGE}FILES+= 2.19
+${PACKAGE}FILES+= 2.2
+${PACKAGE}FILES+= 2.20
+${PACKAGE}FILES+= 2.21
+${PACKAGE}FILES+= 2.22
+${PACKAGE}FILES+= 2.3
+${PACKAGE}FILES+= 2.4
+${PACKAGE}FILES+= 2.5
+${PACKAGE}FILES+= 2.6
+${PACKAGE}FILES+= 2.7
+${PACKAGE}FILES+= 2.8
+${PACKAGE}FILES+= 2.9
+${PACKAGE}FILES+= 3.1
+${PACKAGE}FILES+= 3.2
+${PACKAGE}FILES+= 3.3
+${PACKAGE}FILES+= 3.4
+${PACKAGE}FILES+= 4.1
+${PACKAGE}FILES+= 4.2
+${PACKAGE}FILES+= 4.3
+${PACKAGE}FILES+= 4.4
+${PACKAGE}FILES+= 4.5
+${PACKAGE}FILES+= 4.6
+${PACKAGE}FILES+= 4.7
+${PACKAGE}FILES+= 4.8
+${PACKAGE}FILES+= 5.1
+${PACKAGE}FILES+= 5.2
+${PACKAGE}FILES+= 5.3
+${PACKAGE}FILES+= 5.4
+${PACKAGE}FILES+= 5.5
+${PACKAGE}FILES+= 5.6
+${PACKAGE}FILES+= 5.7
+${PACKAGE}FILES+= 5.8
+${PACKAGE}FILES+= 6.1
+${PACKAGE}FILES+= 6.2
+${PACKAGE}FILES+= 6.3
+${PACKAGE}FILES+= 6.4
+${PACKAGE}FILES+= 6.5
+${PACKAGE}FILES+= 6.6
+${PACKAGE}FILES+= 7.1
+${PACKAGE}FILES+= 7.2
+${PACKAGE}FILES+= 7.3
+${PACKAGE}FILES+= 7.4
+${PACKAGE}FILES+= 7.5
+${PACKAGE}FILES+= 7.6
+${PACKAGE}FILES+= 7.7
+${PACKAGE}FILES+= 7.8
+${PACKAGE}FILES+= 8.1
+${PACKAGE}FILES+= 8.10
+${PACKAGE}FILES+= 8.11
+${PACKAGE}FILES+= 8.12
+${PACKAGE}FILES+= 8.13
+${PACKAGE}FILES+= 8.14
+${PACKAGE}FILES+= 8.15
+${PACKAGE}FILES+= 8.16
+${PACKAGE}FILES+= 8.17
+${PACKAGE}FILES+= 8.18
+${PACKAGE}FILES+= 8.19
+${PACKAGE}FILES+= 8.2
+${PACKAGE}FILES+= 8.20
+${PACKAGE}FILES+= 8.21
+${PACKAGE}FILES+= 8.22
+${PACKAGE}FILES+= 8.23
+${PACKAGE}FILES+= 8.3
+${PACKAGE}FILES+= 8.4
+${PACKAGE}FILES+= 8.5
+${PACKAGE}FILES+= 8.6
+${PACKAGE}FILES+= 8.7
+${PACKAGE}FILES+= 8.8
+${PACKAGE}FILES+= 8.9
+${PACKAGE}FILES+= 9.1
+${PACKAGE}FILES+= 9.10
+${PACKAGE}FILES+= 9.11
+${PACKAGE}FILES+= 9.12
+${PACKAGE}FILES+= 9.13
+${PACKAGE}FILES+= 9.14
+${PACKAGE}FILES+= 9.15
+${PACKAGE}FILES+= 9.16
+${PACKAGE}FILES+= 9.17
+${PACKAGE}FILES+= 9.18
+${PACKAGE}FILES+= 9.19
+${PACKAGE}FILES+= 9.2
+${PACKAGE}FILES+= 9.20
+${PACKAGE}FILES+= 9.21
+${PACKAGE}FILES+= 9.22
+${PACKAGE}FILES+= 9.23
+${PACKAGE}FILES+= 9.24
+${PACKAGE}FILES+= 9.25
+${PACKAGE}FILES+= 9.26
+${PACKAGE}FILES+= 9.27
+${PACKAGE}FILES+= 9.28
+${PACKAGE}FILES+= 9.29
+${PACKAGE}FILES+= 9.3
+${PACKAGE}FILES+= 9.30
+${PACKAGE}FILES+= 9.31
+${PACKAGE}FILES+= 9.4
+${PACKAGE}FILES+= 9.5
+${PACKAGE}FILES+= 9.6
+${PACKAGE}FILES+= 9.7
+${PACKAGE}FILES+= 9.8
+${PACKAGE}FILES+= 9.9
.include <bsd.test.mk>
diff --git a/usr.bin/soelim/tests/Makefile b/usr.bin/soelim/tests/Makefile
index 09f539582643..9528694398c7 100644
--- a/usr.bin/soelim/tests/Makefile
+++ b/usr.bin/soelim/tests/Makefile
@@ -1,17 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= soelim
-FILES= nonexisting.in \
+${PACKAGE}FILES+= nonexisting.in \
basic.in \
basic \
basic.out \
basic-with-space.in \
basic-with-space.out
-FILESDIR= ${TESTSDIR}
.include <bsd.test.mk>
diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile
index 6c52066efa1e..588aa4d75d51 100644
--- a/usr.bin/tar/tests/Makefile
+++ b/usr.bin/tar/tests/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
@@ -91,20 +89,20 @@ list.h: ${TESTS_SRCS} Makefile
CLEANFILES+= list.h list.h.tmp
-FILES+= test_extract.tar.Z.uu
-FILES+= test_extract.tar.bz2.uu
-FILES+= test_extract.tar.grz.uu
-FILES+= test_extract.tar.gz.uu
-FILES+= test_extract.tar.lrz.uu
-FILES+= test_extract.tar.lz.uu
-FILES+= test_extract.tar.lzma.uu
-FILES+= test_extract.tar.lzo.uu
-FILES+= test_extract.tar.xz.uu
-FILES+= test_option_keep_newer_files.tar.Z.uu
-FILES+= test_option_s.tar.Z.uu
-FILES+= test_patterns_2.tar.uu
-FILES+= test_patterns_3.tar.uu
-FILES+= test_patterns_4.tar.uu
-FILES+= test_print_longpath.tar.Z.uu
+${PACKAGE}FILES+= test_extract.tar.Z.uu
+${PACKAGE}FILES+= test_extract.tar.bz2.uu
+${PACKAGE}FILES+= test_extract.tar.grz.uu
+${PACKAGE}FILES+= test_extract.tar.gz.uu
+${PACKAGE}FILES+= test_extract.tar.lrz.uu
+${PACKAGE}FILES+= test_extract.tar.lz.uu
+${PACKAGE}FILES+= test_extract.tar.lzma.uu
+${PACKAGE}FILES+= test_extract.tar.lzo.uu
+${PACKAGE}FILES+= test_extract.tar.xz.uu
+${PACKAGE}FILES+= test_option_keep_newer_files.tar.Z.uu
+${PACKAGE}FILES+= test_option_s.tar.Z.uu
+${PACKAGE}FILES+= test_patterns_2.tar.uu
+${PACKAGE}FILES+= test_patterns_3.tar.uu
+${PACKAGE}FILES+= test_patterns_4.tar.uu
+${PACKAGE}FILES+= test_print_longpath.tar.Z.uu
.include <bsd.test.mk>
diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile
index 77a87ead1b1c..f6103aaa6496 100644
--- a/usr.bin/tests/Makefile
+++ b/usr.bin/tests/Makefile
@@ -1,17 +1,10 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
-FILESDIR= ${TESTSDIR}
-FILES= regress.m4
+${PACKAGE}FILES+= regress.m4
.include <bsd.test.mk>
diff --git a/usr.bin/timeout/tests/Makefile b/usr.bin/timeout/tests/Makefile
index ec528b57332c..bced1554f864 100644
--- a/usr.bin/timeout/tests/Makefile
+++ b/usr.bin/timeout/tests/Makefile
@@ -1,10 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTSDIR= ${TESTSBASE}/usr.bin/timeout
-
ATF_TESTS_SH= timeout
.include <bsd.test.mk>
diff --git a/usr.bin/tr/tests/Makefile b/usr.bin/tr/tests/Makefile
index 44111836f6f1..7decb52c1b17 100644
--- a/usr.bin/tr/tests/Makefile
+++ b/usr.bin/tr/tests/Makefile
@@ -1,29 +1,25 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTSDIR= ${TESTSBASE}/usr.bin/tr
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.00.out
-FILES+= regress.01.out
-FILES+= regress.02.out
-FILES+= regress.03.out
-FILES+= regress.04.out
-FILES+= regress.05.out
-FILES+= regress.06.out
-FILES+= regress.07.out
-FILES+= regress.08.out
-FILES+= regress.09.out
-FILES+= regress.0a.out
-FILES+= regress.0b.out
-FILES+= regress.0c.out
-FILES+= regress.0d.out
-FILES+= regress.in
-FILES+= regress.sh
-FILES+= regress2.in
+${PACKAGE}FILES+= regress.00.out
+${PACKAGE}FILES+= regress.01.out
+${PACKAGE}FILES+= regress.02.out
+${PACKAGE}FILES+= regress.03.out
+${PACKAGE}FILES+= regress.04.out
+${PACKAGE}FILES+= regress.05.out
+${PACKAGE}FILES+= regress.06.out
+${PACKAGE}FILES+= regress.07.out
+${PACKAGE}FILES+= regress.08.out
+${PACKAGE}FILES+= regress.09.out
+${PACKAGE}FILES+= regress.0a.out
+${PACKAGE}FILES+= regress.0b.out
+${PACKAGE}FILES+= regress.0c.out
+${PACKAGE}FILES+= regress.0d.out
+${PACKAGE}FILES+= regress.in
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress2.in
.include <bsd.test.mk>
diff --git a/usr.bin/truncate/tests/Makefile b/usr.bin/truncate/tests/Makefile
index 76f6aeba8f98..82cd606e6d1b 100644
--- a/usr.bin/truncate/tests/Makefile
+++ b/usr.bin/truncate/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH= truncate_test
.include <bsd.test.mk>
diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile
index 471fa4b4196e..5b135f7dbf1f 100644
--- a/usr.bin/units/tests/Makefile
+++ b/usr.bin/units/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= basics_test
.include <bsd.test.mk>
diff --git a/usr.bin/uudecode/tests/Makefile b/usr.bin/uudecode/tests/Makefile
index df865c2bc7a3..6c23c8104413 100644
--- a/usr.bin/uudecode/tests/Makefile
+++ b/usr.bin/uudecode/tests/Makefile
@@ -1,15 +1,12 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.base64.in
-FILES+= regress.out
-FILES+= regress.sh
-FILES+= regress.traditional.in
+${PACKAGE}FILES+= regress.base64.in
+${PACKAGE}FILES+= regress.out
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.traditional.in
.include <bsd.test.mk>
diff --git a/usr.bin/uuencode/tests/Makefile b/usr.bin/uuencode/tests/Makefile
index 4df5886029f2..2c7f18c36328 100644
--- a/usr.bin/uuencode/tests/Makefile
+++ b/usr.bin/uuencode/tests/Makefile
@@ -1,15 +1,12 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.base64.out
-FILES+= regress.in
-FILES+= regress.sh
-FILES+= regress.traditional.out
+${PACKAGE}FILES+= regress.base64.out
+${PACKAGE}FILES+= regress.in
+${PACKAGE}FILES+= regress.sh
+${PACKAGE}FILES+= regress.traditional.out
.include <bsd.test.mk>
diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile
index edd5adfd9015..228c1d545781 100644
--- a/usr.bin/xargs/tests/Makefile
+++ b/usr.bin/xargs/tests/Makefile
@@ -1,31 +1,28 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= regress.0.in
-FILES+= regress.0.out
-FILES+= regress.0I.out
-FILES+= regress.0J.out
-FILES+= regress.0L.out
-FILES+= regress.0P1.out
-FILES+= regress.I.out
-FILES+= regress.J.out
-FILES+= regress.L.out
-FILES+= regress.P1.out
-FILES+= regress.R.out
-FILES+= regress.in
-FILES+= regress.n1.out
-FILES+= regress.n2.out
-FILES+= regress.n2P0.out
-FILES+= regress.n3.out
-FILES+= regress.normal.out
-FILES+= regress.quotes.in
-FILES+= regress.quotes.out
-FILES+= regress.sh
+${PACKAGE}FILES+= regress.0.in
+${PACKAGE}FILES+= regress.0.out
+${PACKAGE}FILES+= regress.0I.out
+${PACKAGE}FILES+= regress.0J.out
+${PACKAGE}FILES+= regress.0L.out
+${PACKAGE}FILES+= regress.0P1.out
+${PACKAGE}FILES+= regress.I.out
+${PACKAGE}FILES+= regress.J.out
+${PACKAGE}FILES+= regress.L.out
+${PACKAGE}FILES+= regress.P1.out
+${PACKAGE}FILES+= regress.R.out
+${PACKAGE}FILES+= regress.in
+${PACKAGE}FILES+= regress.n1.out
+${PACKAGE}FILES+= regress.n2.out
+${PACKAGE}FILES+= regress.n2P0.out
+${PACKAGE}FILES+= regress.n3.out
+${PACKAGE}FILES+= regress.normal.out
+${PACKAGE}FILES+= regress.quotes.in
+${PACKAGE}FILES+= regress.quotes.out
+${PACKAGE}FILES+= regress.sh
.include <bsd.test.mk>
diff --git a/usr.bin/xo/tests/Makefile b/usr.bin/xo/tests/Makefile
index c8d86d081839..182e83438144 100644
--- a/usr.bin/xo/tests/Makefile
+++ b/usr.bin/xo/tests/Makefile
@@ -1,10 +1,8 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
+.include <bsd.own.mk>
LIBXOSRC= ${SRCTOP}/contrib/libxo
@@ -12,28 +10,26 @@ LIBXOSRC= ${SRCTOP}/contrib/libxo
.c.out .o.out:
-TESTSDIR= ${TESTSBASE}/usr.bin/xo
-
BINDIR= ${TESTSDIR}
ATF_TESTS_SH+= functional_test
-FILES+= xo_01.H.err
-FILES+= xo_01.H.out
-FILES+= xo_01.HIPx.err
-FILES+= xo_01.HIPx.out
-FILES+= xo_01.HP.err
-FILES+= xo_01.HP.out
-FILES+= xo_01.J.err
-FILES+= xo_01.J.out
-FILES+= xo_01.JP.err
-FILES+= xo_01.JP.out
-FILES+= xo_01.T.err
-FILES+= xo_01.T.out
-FILES+= xo_01.X.err
-FILES+= xo_01.X.out
-FILES+= xo_01.XP.err
-FILES+= xo_01.XP.out
+${PACKAGE}FILES+= xo_01.H.err
+${PACKAGE}FILES+= xo_01.H.out
+${PACKAGE}FILES+= xo_01.HIPx.err
+${PACKAGE}FILES+= xo_01.HIPx.out
+${PACKAGE}FILES+= xo_01.HP.err
+${PACKAGE}FILES+= xo_01.HP.out
+${PACKAGE}FILES+= xo_01.J.err
+${PACKAGE}FILES+= xo_01.J.out
+${PACKAGE}FILES+= xo_01.JP.err
+${PACKAGE}FILES+= xo_01.JP.out
+${PACKAGE}FILES+= xo_01.T.err
+${PACKAGE}FILES+= xo_01.T.out
+${PACKAGE}FILES+= xo_01.X.err
+${PACKAGE}FILES+= xo_01.X.out
+${PACKAGE}FILES+= xo_01.XP.err
+${PACKAGE}FILES+= xo_01.XP.out
SCRIPTS+= xo_01
CLEANFILES+= xo_01
diff --git a/usr.bin/yacc/tests/Makefile b/usr.bin/yacc/tests/Makefile
index 576aa54f1415..52e2a2738da2 100644
--- a/usr.bin/yacc/tests/Makefile
+++ b/usr.bin/yacc/tests/Makefile
@@ -2,11 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-PACKAGE= tests
-
TEST_DIR= ${SRCTOP}/contrib/byacc/test
.PATH: ${TEST_DIR} ${TEST_DIR}/yacc
@@ -22,8 +17,7 @@ SCRIPTSDIR= ${TESTSDIR}
CLEANFILES= run_test
-FILESGROUPS+= FILES FILEStest FILEStest_yacc
-FILESPACKAGE= ${PACKAGE}
+FILESGROUPS+= FILEStest FILEStest_yacc
FILEStestPACKAGE=${PACKAGE}
FILEStest_yaccPACKAGE=${PACKAGE}
diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile
index cdf872a0f86a..fb13f3fb0abe 100644
--- a/usr.sbin/chown/tests/Makefile
+++ b/usr.sbin/chown/tests/Makefile
@@ -2,10 +2,6 @@
.include <bsd.own.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TESTSDIR= ${TESTSBASE}/bin/chown
TAP_TESTS_SH= chown-f_test
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile
index 1f09f1fab500..45b12b7bb75d 100644
--- a/usr.sbin/etcupdate/tests/Makefile
+++ b/usr.sbin/etcupdate/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
PLAIN_TESTS_SH=
.for test in always_test \
conflicts_test \
diff --git a/usr.sbin/extattr/tests/Makefile b/usr.sbin/extattr/tests/Makefile
index 935e6cfa6e4c..7dec010fe009 100644
--- a/usr.sbin/extattr/tests/Makefile
+++ b/usr.sbin/extattr/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH= extattr_test
.include <bsd.test.mk>
diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile
index 9be7d453aba7..71fc811a7eda 100644
--- a/usr.sbin/fstyp/tests/Makefile
+++ b/usr.sbin/fstyp/tests/Makefile
@@ -1,17 +1,14 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= fstyp_test
-FILES= ext2.img.bz2
-FILES+= ext3.img.bz2
-FILES+= ext4.img.bz2
-FILES+= ext4_with_label.img.bz2
-FILES+= ntfs.img.bz2
-FILES+= ntfs_with_label.img.bz2
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= ext2.img.bz2
+${PACKAGE}FILES+= ext3.img.bz2
+${PACKAGE}FILES+= ext4.img.bz2
+${PACKAGE}FILES+= ext4_with_label.img.bz2
+${PACKAGE}FILES+= ntfs.img.bz2
+${PACKAGE}FILES+= ntfs_with_label.img.bz2
.include <bsd.test.mk>
diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile
index 87a48588494b..85e4b233aea7 100644
--- a/usr.sbin/makefs/tests/Makefile
+++ b/usr.sbin/makefs/tests/Makefile
@@ -1,14 +1,11 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
ATF_TESTS_SH+= makefs_cd9660_tests
ATF_TESTS_SH+= makefs_ffs_tests
BINDIR= ${TESTSDIR}
+# XXX: PACKAGE support for SCRIPTS
SCRIPTS+= makefs_tests_common.sh
SCRIPTSNAME_makefs_tests_common.sh= makefs_tests_common.sh
diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile
index 0b87442b2521..802a44c01012 100644
--- a/usr.sbin/newsyslog/tests/Makefile
+++ b/usr.sbin/newsyslog/tests/Makefile
@@ -1,9 +1,5 @@
# $FreeBSD$
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
TAP_TESTS_SH= legacy_test
.include <bsd.test.mk>
diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile
index b4cc2f5535e6..f88b4db110fc 100644
--- a/usr.sbin/nmtree/tests/Makefile
+++ b/usr.sbin/nmtree/tests/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
+
TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree
.PATH: ${TESTSRC}
@@ -10,25 +9,23 @@ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree
ATF_TESTS_SH= nmtree_test
ATF_TESTS_SH_SRC_nmtree_test= t_mtree.sh
-FILESDIR= ${TESTSDIR}
-
# NOTE: the output from FreeBSD's nmtree displays sha256digest instead of
# sha256; we need to mangle the specfiles to reflect this.
.for f in mtree_d_create.out netbsd6_d_create.out
CLEANFILES+= $f $f.tmp
-FILES+= $f
+${PACKAGE}FILES+= $f
$f: ${TESTSRC}/$f
sed -e 's/sha256/sha256digest/g' < ${.ALLSRC} > ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.endfor
-FILES+= d_convert.in
-FILES+= d_convert_C.out
-FILES+= d_convert_C_S.out
-FILES+= d_convert_D.out
-FILES+= d_convert_D_S.out
-FILES+= d_merge.in
-FILES+= d_merge_C_M.out
-FILES+= d_merge_C_M_S.out
+${PACKAGE}FILES+= d_convert.in
+${PACKAGE}FILES+= d_convert_C.out
+${PACKAGE}FILES+= d_convert_C_S.out
+${PACKAGE}FILES+= d_convert_D.out
+${PACKAGE}FILES+= d_convert_D_S.out
+${PACKAGE}FILES+= d_merge.in
+${PACKAGE}FILES+= d_merge_C_M.out
+${PACKAGE}FILES+= d_merge_C_M_S.out
.include <bsd.test.mk>
diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile
index 66ab454be807..1c69d501e30c 100644
--- a/usr.sbin/pw/tests/Makefile
+++ b/usr.sbin/pw/tests/Makefile
@@ -1,8 +1,6 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
ATF_TESTS_SH= pw_etcdir \
pw_lock \
@@ -19,8 +17,10 @@ ATF_TESTS_SH= pw_etcdir \
TEST_METADATA.${tp}+= required_user="root"
.endfor
-FILES= group helper_functions.shin master.passwd pw.conf \
- pw-modified.conf
-FILESDIR= ${TESTSDIR}
+${PACKAGE}FILES+= group
+${PACKAGE}FILES+= helper_functions.shin
+${PACKAGE}FILES+= master.passwd
+${PACKAGE}FILES+= pw.conf
+${PACKAGE}FILES+= pw-modified.conf
.include <bsd.test.mk>
diff --git a/usr.sbin/rpcbind/tests/Makefile b/usr.sbin/rpcbind/tests/Makefile
index 83b452246cf7..4b0cf15f13da 100644
--- a/usr.sbin/rpcbind/tests/Makefile
+++ b/usr.sbin/rpcbind/tests/Makefile
@@ -2,10 +2,6 @@
.include <src.opts.mk>
-PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
-
.PATH: ${.CURDIR}/..
ATF_TESTS_C= addrmerge_test
diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile
index 36bfcc04163f..6d03999b3c15 100644
--- a/usr.sbin/sa/tests/Makefile
+++ b/usr.sbin/sa/tests/Makefile
@@ -1,35 +1,32 @@
# $FreeBSD$
PACKAGE= tests
-FILESGROUPS= TESTS
-TESTSPACKAGE= ${PACKAGE}
TAP_TESTS_SH= legacy_test
-FILESDIR= ${TESTSDIR}
-FILES= v1-amd64-sav.in
-FILES+= v1-amd64-sav.out
-FILES+= v1-amd64-u.out
-FILES+= v1-amd64-usr.in
-FILES+= v1-amd64-usr.out
-FILES+= v1-i386-sav.in
-FILES+= v1-i386-sav.out
-FILES+= v1-i386-u.out
-FILES+= v1-i386-usr.in
-FILES+= v1-i386-usr.out
-FILES+= v1-sparc64-sav.in
-FILES+= v1-sparc64-sav.out
-FILES+= v1-sparc64-u.out
-FILES+= v1-sparc64-usr.in
-FILES+= v1-sparc64-usr.out
-FILES+= v2-amd64-sav.in
-FILES+= v2-amd64-u.out
-FILES+= v2-amd64-usr.in
-FILES+= v2-i386-sav.in
-FILES+= v2-i386-u.out
-FILES+= v2-i386-usr.in
-FILES+= v2-sparc64-sav.in
-FILES+= v2-sparc64-u.out
-FILES+= v2-sparc64-usr.in
+${PACKAGE}FILES+= v1-amd64-sav.in
+${PACKAGE}FILES+= v1-amd64-sav.out
+${PACKAGE}FILES+= v1-amd64-u.out
+${PACKAGE}FILES+= v1-amd64-usr.in
+${PACKAGE}FILES+= v1-amd64-usr.out
+${PACKAGE}FILES+= v1-i386-sav.in
+${PACKAGE}FILES+= v1-i386-sav.out
+${PACKAGE}FILES+= v1-i386-u.out
+${PACKAGE}FILES+= v1-i386-usr.in
+${PACKAGE}FILES+= v1-i386-usr.out
+${PACKAGE}FILES+= v1-sparc64-sav.in
+${PACKAGE}FILES+= v1-sparc64-sav.out
+${PACKAGE}FILES+= v1-sparc64-u.out
+${PACKAGE}FILES+= v1-sparc64-usr.in
+${PACKAGE}FILES+= v1-sparc64-usr.out
+${PACKAGE}FILES+= v2-amd64-sav.in
+${PACKAGE}FILES+= v2-amd64-u.out
+${PACKAGE}FILES+= v2-amd64-usr.in
+${PACKAGE}FILES+= v2-i386-sav.in
+${PACKAGE}FILES+= v2-i386-u.out
+${PACKAGE}FILES+= v2-i386-usr.in
+${PACKAGE}FILES+= v2-sparc64-sav.in
+${PACKAGE}FILES+= v2-sparc64-u.out
+${PACKAGE}FILES+= v2-sparc64-usr.in
.include <bsd.test.mk>
diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile
index 06058a0be5e4..3b3078f8612a 100644
--- a/usr.sbin/tests/Makefile
+++ b/usr.sbin/tests/Makefile
@@ -1,13 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-FILESGROUPS= FILES
-PACKAGE= tests
-FILESGROUPS+= TESTS
-TESTSPACKAGE= ${PACKAGE}
-TESTS+= Kyuafile
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes