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 /lib/libxo | |
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 'lib/libxo')
-rw-r--r-- | lib/libxo/tests/Makefile | 416 | ||||
-rw-r--r-- | lib/libxo/tests/encoder/Makefile | 4 |
2 files changed, 206 insertions, 214 deletions
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 |