diff options
author | gjb <gjb@FreeBSD.org> | 2015-10-15 17:36:56 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2015-10-15 17:36:56 +0000 |
commit | 609a691adaec0e17e6c3e66dd8f5c3a0f5b05882 (patch) | |
tree | 938919dc21bad97a2e96d808270dd31b2c871668 /gnu | |
parent | 3484950cf7faac9943c1f04bb91592f2b0de1d22 (diff) | |
parent | e0a76fc624ff8f59328873dcf100f69d94d852f8 (diff) | |
download | FreeBSD-src-609a691adaec0e17e6c3e66dd8f5c3a0f5b05882.zip FreeBSD-src-609a691adaec0e17e6c3e66dd8f5c3a0f5b05882.tar.gz |
MFH to r289370
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/lib/tests/Makefile | 4 | ||||
-rw-r--r-- | gnu/tests/Makefile | 4 | ||||
-rw-r--r-- | gnu/usr.bin/diff/tests/Makefile | 11 | ||||
-rw-r--r-- | gnu/usr.bin/tests/Makefile | 4 |
4 files changed, 7 insertions, 16 deletions
diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile index 256e245..a0e63e5 100644 --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/gnu/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile index de42fae..a0e63e5 100644 --- a/gnu/tests/Makefile +++ b/gnu/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/gnu - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> diff --git a/gnu/usr.bin/diff/tests/Makefile b/gnu/usr.bin/diff/tests/Makefile index aa1629d..16439b3 100644 --- a/gnu/usr.bin/diff/tests/Makefile +++ b/gnu/usr.bin/diff/tests/Makefile @@ -1,17 +1,14 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff -.PATH: ${TESTSRC} +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff -.include <bsd.own.mk> - -TESTSDIR= ${TESTSBASE}/gnu/usr.bin/diff -ATF_TESTS_SH= diff_test +NETBSD_ATF_TESTS_SH= diff_test ATF_TESTS_SH_SED_diff_test= -e 's/t_diff/`basename $$0`/g' -ATF_TESTS_SH_SRC_diff_test= t_diff.sh FILESDIR= ${TESTSDIR} FILES+= d_mallocv1.in FILES+= d_mallocv2.in +.include <netbsd-tests.test.mk> + .include <bsd.test.mk> diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile index eebbff6..a0e63e5 100644 --- a/gnu/usr.bin/tests/Makefile +++ b/gnu/usr.bin/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/gnu/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> |