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 /gnu | |
| 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 '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> |
