diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
| commit | b2d48be1bc7df45ddd13b143a160d0acb5a383c5 (patch) | |
| tree | 67a85c5694bcdbbc7b1839be795cd25ef318ed91 /lib/atf | |
| parent | 4f4a7a03cea15a671284f9c06ada80755c994df6 (diff) | |
| download | src-b2d48be1bc7df45ddd13b143a160d0acb5a383c5.tar.gz src-b2d48be1bc7df45ddd13b143a160d0acb5a383c5.zip | |
Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and
netbsd-tests.test.mk (r289151)
- Eliminate explicit OBJTOP/SRCTOP setting
- Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk
- Remove unnecessary TESTSDIR setting
- Use SRCTOP where possible for clarity
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Divison
Notes
Notes:
svn path=/head/; revision=289172
Diffstat (limited to 'lib/atf')
| -rw-r--r-- | lib/atf/libatf-c++/tests/Makefile | 3 | ||||
| -rw-r--r-- | lib/atf/libatf-c++/tests/detail/Makefile | 2 | ||||
| -rw-r--r-- | lib/atf/libatf-c/tests/Makefile | 3 | ||||
| -rw-r--r-- | lib/atf/libatf-c/tests/detail/Makefile | 2 | ||||
| -rw-r--r-- | lib/atf/tests/Makefile | 2 | ||||
| -rw-r--r-- | lib/atf/tests/test-programs/Makefile | 2 |
6 files changed, 6 insertions, 8 deletions
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index 5f5a57515bb2..a069bb19d1e6 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -2,10 +2,9 @@ .include <bsd.init.mk> -TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++ TESTS_SUBDIRS= detail -ATF= ${.CURDIR:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c++ .PATH: ${ATF}/atf-c++/detail diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index 69c3e7bac0d0..f7d672e792fb 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail -ATF= ${.CURDIR:H:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c++/detail CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index d5b6dc07520c..e864c2e8bafc 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -2,10 +2,9 @@ .include <bsd.init.mk> -TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c TESTS_SUBDIRS= detail -ATF= ${.CURDIR:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c .PATH: ${ATF}/atf-c/detail diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index 02c1f2b444d3..e47fd566ec01 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail -ATF= ${.CURDIR:H:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-c/detail CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 7bc96c94b039..dc79bb3491f5 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index b0c1c2376481..aa308268a043 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -5,7 +5,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf/test-programs KYUAFILE= yes -ATF= ${.CURDIR:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/test-programs CFLAGS+= -I${ATF} |