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 /libexec | |
| 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 'libexec')
| -rw-r--r-- | libexec/atf/atf-check/tests/Makefile | 4 | ||||
| -rw-r--r-- | libexec/atf/atf-sh/tests/Makefile | 4 | ||||
| -rw-r--r-- | libexec/atf/tests/Makefile | 4 | ||||
| -rw-r--r-- | libexec/rtld-elf/tests/Makefile | 1 | ||||
| -rw-r--r-- | libexec/tests/Makefile | 4 |
5 files changed, 4 insertions, 13 deletions
diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index 43a74988a27b..87b26cb4a823 100644 --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.init.mk> -TESTSDIR= ${TESTSBASE}/libexec/atf/atf-check - -ATF= ${.CURDIR:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh ATF_TESTS_SH= atf-check_test diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile index 3360b974f9ee..9ccd6a7a44f1 100644 --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.init.mk> -TESTSDIR= ${TESTSBASE}/libexec/atf/atf-sh - -ATF= ${.CURDIR:H:H:H:H}/contrib/atf +ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh ATF_TESTS_SH+= atf_check_test diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index 7aa96019367e..a0e63e5da42a 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/libexec/atf - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index f384218b1a59..7d3be6837dcb 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -2,7 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/libexec/rtld-elf SUBDIR+= libpythagoras target ATF_TESTS_C= ld_library_pathfds diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile index 665efab4275e..a0e63e5da42a 100644 --- a/libexec/tests/Makefile +++ b/libexec/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/libexec - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> |