summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-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
48 files changed, 468 insertions, 640 deletions
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index bebc7ef..0e0e455 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 f194abf..f7d672e 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 82d6db4..9b4e129 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 13f3819..e47fd56 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 44ed728..61f839a 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 4d756cf..113a387 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 160ebb4..3e05c64 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 8276422..ff1af55 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 7790628..05da6ea 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 ffe90d0..6c7ce96 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 b4e14d9..0830977 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 a9800db..5e8bc6f 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 659f73b..9b687c6 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 188ba7f..313dff3 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 f061508..ee6f98e 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 5a5954a..e05cbae 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 56710c1..23def7e 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 d21d336..96b60d2 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 da676a7..79f13c5 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 f60d512..c4f4351 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 cc17ef5..cb82da6 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 6a6ae7b..d7780ef 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 b645b4d..39b0a96 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 11ccca9..2ac74aa 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 50484fd..72685e0 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 08f34b0..87e84c5 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 a8db9c3..ea2dfcf 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 e79204a..6711287 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 81b0ff1..0495d68 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 49745e2..feb543d 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 0e98fed..cbf441d 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 74f826a..84225f4 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 79b05f8..5449799 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 c9520fb..d5b8f01 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 0c831ad..15798b2 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 86f0985..42749d0 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 d815af4..cce0b5e 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 ec32229..e40936a 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 768078e..d48250e 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 7f788ae..c4817ec 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 6c2139a..159cc3b 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 1f587a5..bea70ec 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 a7f685f..b9a9031 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 2f46850..81b2a49 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 de59ada..20580ed 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 491af0c..2fe4245 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 3e0823f..37dd34f 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 06058a0..3b3078f 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
OpenPOWER on IntegriCloud