From 430f7286a566b1407c7b32ce13585caf5aa59b92 Mon Sep 17 00:00:00 2001 From: Enji Cooper 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 --- lib/atf/libatf-c++/tests/Makefile | 9 +++------ lib/atf/libatf-c++/tests/detail/Makefile | 3 --- lib/atf/libatf-c/tests/Makefile | 7 ++----- lib/atf/libatf-c/tests/detail/Makefile | 6 ------ lib/atf/tests/Makefile | 10 ---------- lib/atf/tests/test-programs/Makefile | 6 +----- 6 files changed, 6 insertions(+), 35 deletions(-) (limited to 'lib/atf') diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index bebc7efc8175..0e0e455e458d 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -2,9 +2,7 @@ .include -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} +PACKAGE= tests TESTS_SUBDIRS= detail @@ -16,9 +14,8 @@ CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} -FILESDIR= ${TESTSDIR} -FILES= macros_hpp_test.cpp -FILES+= unused_test.cpp +${PACKAGE}FILES+= macros_hpp_test.cpp +${PACKAGE}FILES+= unused_test.cpp .for _T in atf_c++_test \ build_test \ diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index f194abf9041d..f7d672e792fb 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -2,9 +2,6 @@ .include -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 82d6db427110..9b4e1299228f 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -3,8 +3,6 @@ .include PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTS_SUBDIRS= detail @@ -20,9 +18,8 @@ CFLAGS+= -I${ATF} # TODO(jmmv): Remove this workaround once we do that update. CFLAGS.clang+= -Wno-duplicate-decl-specifier -FILESDIR= ${TESTSDIR} -FILES= macros_h_test.c -FILES+= unused_test.c +${PACKAGE}FILES+= macros_h_test.c +${PACKAGE}FILES+= unused_test.c .for _T in atf_c_test \ build_test \ diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 13f3819d1452..e47fd566ec01 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -2,12 +2,6 @@ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 44ed72876fb9..61f839a55ca1 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,15 +1,5 @@ # $FreeBSD$ -.include - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/lib/atf -TESTS+= Kyuafile - - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index 4d756cf6dfa2..113a387c2979 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -2,12 +2,8 @@ .include -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs -TESTS+= Kyuafile + KYUAFILE= yes ATF= ${SRCTOP}/contrib/atf -- cgit v1.2.3