diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
| commit | 82ceeb2ea625cd9bff60f2863b9a0830f55b7905 (patch) | |
| tree | 263ca9347bf664a4489743f9302e699ce14de1df /libexec | |
| parent | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (diff) | |
| parent | d20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff) | |
| download | FreeBSD-src-devel.zip FreeBSD-src-devel.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into develdevel
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> |
