diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-05-04 23:20:53 +0000 |
| commit | 430f7286a566b1407c7b32ce13585caf5aa59b92 (patch) | |
| tree | a3a2f2051c05cb9a95c4a94f6c5bbcd7a12cdfea /lib/atf | |
| parent | e45163b2162def698a0320716097091257c39dea (diff) | |
| download | src-430f7286a566b1407c7b32ce13585caf5aa59b92.tar.gz src-430f7286a566b1407c7b32ce13585caf5aa59b92.zip | |
Notes
Diffstat (limited to 'lib/atf')
| -rw-r--r-- | lib/atf/libatf-c++/tests/Makefile | 9 | ||||
| -rw-r--r-- | lib/atf/libatf-c++/tests/detail/Makefile | 3 | ||||
| -rw-r--r-- | lib/atf/libatf-c/tests/Makefile | 7 | ||||
| -rw-r--r-- | lib/atf/libatf-c/tests/detail/Makefile | 6 | ||||
| -rw-r--r-- | lib/atf/tests/Makefile | 10 | ||||
| -rw-r--r-- | lib/atf/tests/test-programs/Makefile | 6 |
6 files changed, 6 insertions, 35 deletions
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 <bsd.init.mk> -PACKAGE=tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} +PACKAGE= tests TESTS_SUBDIRS= detail @@ -16,9 +14,8 @@ CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} -FILESDIR= ${TESTSDIR} -FILES= macros_hpp_test.cpp -FILES+= unused_test.cpp +${PACKAGE}FILES+= macros_hpp_test.cpp +${PACKAGE}FILES+= unused_test.cpp .for _T in atf_c++_test \ build_test \ diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index f194abf9041d..f7d672e792fb 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -2,9 +2,6 @@ .include <bsd.init.mk> -PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 82d6db427110..9b4e1299228f 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -3,8 +3,6 @@ .include <bsd.init.mk> PACKAGE= tests -FILESGROUPS= TESTS -TESTSPACKAGE= ${PACKAGE} TESTS_SUBDIRS= detail @@ -20,9 +18,8 @@ CFLAGS+= -I${ATF} # TODO(jmmv): Remove this workaround once we do that update. CFLAGS.clang+= -Wno-duplicate-decl-specifier -FILESDIR= ${TESTSDIR} -FILES= macros_h_test.c -FILES+= unused_test.c +${PACKAGE}FILES+= macros_h_test.c +${PACKAGE}FILES+= unused_test.c .for _T in atf_c_test \ build_test \ diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 13f3819d1452..e47fd566ec01 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -2,12 +2,6 @@ .include <bsd.init.mk> -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTS+= Kyuafile - TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail ATF= ${SRCTOP}/contrib/atf diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 44ed72876fb9..61f839a55ca1 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,15 +1,5 @@ # $FreeBSD$ -.include <bsd.own.mk> - -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} -TESTSDIR= ${TESTSBASE}/lib/atf -TESTS+= Kyuafile - - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index 4d756cf6dfa2..113a387c2979 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -2,12 +2,8 @@ .include <bsd.init.mk> -FILESGROUPS= FILES -PACKAGE= tests -FILESGROUPS+= TESTS -TESTSPACKAGE= ${PACKAGE} TESTSDIR= ${TESTSBASE}/lib/atf/test-programs -TESTS+= Kyuafile + KYUAFILE= yes ATF= ${SRCTOP}/contrib/atf |