From dd1f61836762d6bb73b65e51a11b769b15667412 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 12 Oct 2015 08:16:03 +0000 Subject: 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 --- cddl/lib/tests/Makefile | 4 +--- cddl/sbin/tests/Makefile | 4 +--- cddl/tests/Makefile | 4 +--- cddl/usr.bin/tests/Makefile | 4 +--- cddl/usr.sbin/dtrace/tests/Makefile | 3 +-- cddl/usr.sbin/tests/Makefile | 4 +--- 6 files changed, 6 insertions(+), 17 deletions(-) (limited to 'cddl') diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile index 4a49d9f..a0e63e5 100644 --- a/cddl/lib/tests/Makefile +++ b/cddl/lib/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/cddl/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile index 91bbaee..a0e63e5 100644 --- a/cddl/sbin/tests/Makefile +++ b/cddl/sbin/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/cddl/sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile index 34a27ea..a0e63e5 100644 --- a/cddl/tests/Makefile +++ b/cddl/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/cddl - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile index c94d591..a0e63e5 100644 --- a/cddl/usr.bin/tests/Makefile +++ b/cddl/usr.bin/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile index dfd2b54..7db6f2f 100644 --- a/cddl/usr.sbin/dtrace/tests/Makefile +++ b/cddl/usr.sbin/dtrace/tests/Makefile @@ -2,10 +2,9 @@ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace TESTS_SUBDIRS+= common -.PATH: ${.CURDIR:H:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= YES .PATH: ${.CURDIR}/tools diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile index 0305aee..a0e63e5 100644 --- a/cddl/usr.sbin/tests/Makefile +++ b/cddl/usr.sbin/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include -- cgit v1.1