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 /gnu/usr.bin | |
| 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 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/diff/tests/Makefile | 11 | ||||
| -rw-r--r-- | gnu/usr.bin/tests/Makefile | 4 |
2 files changed, 5 insertions, 10 deletions
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> |
