From 92100036c841e961994633b0de4fdbc3c8217fb7 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 4 May 2016 23:20:53 +0000 Subject: 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 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 --- usr.bin/bmake/tests/execution/Makefile | 3 --- usr.bin/bmake/tests/execution/ellipsis/Makefile | 12 +++++------- usr.bin/bmake/tests/execution/empty/Makefile | 12 +++++------- usr.bin/bmake/tests/execution/joberr/Makefile | 12 +++++------- usr.bin/bmake/tests/execution/plus/Makefile | 12 +++++------- 5 files changed, 20 insertions(+), 31 deletions(-) (limited to 'usr.bin/bmake/tests/execution') 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 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 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 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 -- cgit v1.1