diff options
| author | ngie <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
| commit | 92100036c841e961994633b0de4fdbc3c8217fb7 (patch) | |
| tree | a3a2f2051c05cb9a95c4a94f6c5bbcd7a12cdfea /usr.bin | |
| parent | 76fb86ddfe6fe8cd628ebfb49b50dea38466dcef (diff) | |
| download | FreeBSD-src-92100036c841e961994633b0de4fdbc3c8217fb7.zip FreeBSD-src-92100036c841e961994633b0de4fdbc3c8217fb7.tar.gz | |
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
Diffstat (limited to 'usr.bin')
85 files changed, 860 insertions, 1098 deletions
diff --git a/usr.bin/apply/tests/Makefile b/usr.bin/apply/tests/Makefile index 6348f89..af17a27 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 cada2f7..bad7b28 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 ee3dcf2..6c343da 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 c8914b9..f80ffc2 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 5ef093f..99a2093b 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 0b9db19..baf3e44 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 b76bdc1..2dbfa64 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 1164a44..56dfb33 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 d1ee84d..0f82a64 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 3faeffa..b4bdb25 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 6d7b6b4..1f0f7f9 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 2b268e9..05532f3 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 5b3bab7..2c91bbb 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 abc8b9e..e3008fa 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 2828140..3a9390c 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 7056afd..8eeaa82 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 c5e42bd..884b991 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 ca0c99f..13b570e 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 713e825..d603c46 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 4b14289..f7cab6c 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 8b1ce86..6dbb872 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 acc6339..7fecfd3 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 b0f21ab..980b99c 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 e627010..1695c88 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 0839dfa..60ec86e 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 d917de0..bbfc150 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 621ec60..cfcfdca 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 a1c6535..d66ca35 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 2dd0df5..3cd89f8 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 e790b94..d29b830 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 0ba16a7..b41c752 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 3e56b2b..eae22ec 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 cb57bbc..c48e175 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 8dccb03..90d90f1 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 87e6827..0522432 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 2a6fc75..2204807 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 d31d561..f38383c 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 e7620a5..ef40ab9 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 a66fb25..eb01f5d 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 bf3991a..7c2e619 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 fac186f..4d32823 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 dc46dd8..dea788d 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 5ce3194..36d0575 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 9b0526f..7d1c68e 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 1c6bad0..734c7d8 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 7aec656..f35c07c 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 56615df..e010718 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 5841047..f4bd324 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 b35881a..364ff11 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 f52507f..cd9cb51 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 4b845d7..50a8ff7 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 a3bdada..4491e22 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 3e58b00..bfae46c 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 b9fc67b..43ae05b 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 90c34c0..653ad22 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 c65878f..a2a3c11 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 2491418..310994e 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 28119f9..cc20dd3 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 83feec2..a35406b 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 945af13..041259b 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 96acbd2..03a5852 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 e38eb10..a1c6449 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 369be0a..46c83e3 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 c85b4a1..10e102b 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 71fe66e..3aa4b75 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 e57fe60..54bf892 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 24b453a..c3002f6 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 b98da39..321a5a6 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 8752f77..404f512 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 9217881..04b43fd 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 2c0b916..b01c3b6 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 eaeaa43..0d017e1 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 f3fb038..aecb6ea 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 09f5395..9528694 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 6c52066..588aa4d 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 77a87ea..f6103aa 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 ec528b57..bced155 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 4411183..7decb52 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 76f6aeb..82cd606 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 471fa4b..5b135f7 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 df865c2..6c23c81 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 4df5886..2c7f18c 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 edd5adf..228c1d5 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 c8d86d0..182e834 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 576aa54..52e2a27 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} |
