diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-09 22:49:48 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-09 22:49:48 +0000 |
| commit | 6b3722162f25f17568ac341320ee8e7ede42bc7e (patch) | |
| tree | b94a04c0147f408897b87a9704b40d0c5fd8067f /libexec | |
| parent | 72ef9ff5b96eef28f0024f16157bf47833200e6d (diff) | |
| download | FreeBSD-src-6b3722162f25f17568ac341320ee8e7ede42bc7e.zip FreeBSD-src-6b3722162f25f17568ac341320ee8e7ede42bc7e.tar.gz | |
MFC r289172,r290254:
r289172:
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
r290254:
Remove unused variable (SRCDIR)
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/tests/Makefile | 4 |
4 files changed, 4 insertions, 12 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> diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile index 665efab..a0e63e5 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> |
