diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
| commit | dd1f61836762d6bb73b65e51a11b769b15667412 (patch) | |
| tree | 67a85c5694bcdbbc7b1839be795cd25ef318ed91 /libexec/atf | |
| parent | 2bf557556019c20890d0a2879f67d834b0527735 (diff) | |
| download | FreeBSD-src-dd1f61836762d6bb73b65e51a11b769b15667412.zip FreeBSD-src-dd1f61836762d6bb73b65e51a11b769b15667412.tar.gz | |
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
Diffstat (limited to 'libexec/atf')
| -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 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index 43a7498..87b26cb 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 3360b97..9ccd6a7 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 7aa9601..a0e63e5 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> |
