summaryrefslogtreecommitdiffstats
path: root/secure
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-10-12 08:16:03 +0000
committerngie <ngie@FreeBSD.org>2015-10-12 08:16:03 +0000
commitdd1f61836762d6bb73b65e51a11b769b15667412 (patch)
tree67a85c5694bcdbbc7b1839be795cd25ef318ed91 /secure
parent2bf557556019c20890d0a2879f67d834b0527735 (diff)
downloadFreeBSD-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 'secure')
-rw-r--r--secure/lib/tests/Makefile4
-rw-r--r--secure/libexec/tests/Makefile4
-rw-r--r--secure/tests/Makefile4
-rw-r--r--secure/usr.bin/tests/Makefile4
-rw-r--r--secure/usr.sbin/tests/Makefile4
5 files changed, 5 insertions, 15 deletions
diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile
index cd6bcff..a0e63e5 100644
--- a/secure/lib/tests/Makefile
+++ b/secure/lib/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/secure/lib
-
-.PATH: ${.CURDIR:H:H:H}/tests
+.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>
diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile
index 6debef8..a0e63e5 100644
--- a/secure/libexec/tests/Makefile
+++ b/secure/libexec/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/secure/libexec
-
-.PATH: ${.CURDIR:H:H:H}/tests
+.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>
diff --git a/secure/tests/Makefile b/secure/tests/Makefile
index 2e6dbc4..a0e63e5 100644
--- a/secure/tests/Makefile
+++ b/secure/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/secure
-
-.PATH: ${.CURDIR:H:H}/tests
+.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>
diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile
index 1c06699..a0e63e5 100644
--- a/secure/usr.bin/tests/Makefile
+++ b/secure/usr.bin/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/secure/usr.bin
-
-.PATH: ${.CURDIR:H:H:H}/tests
+.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>
diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile
index 25e95f0..a0e63e5 100644
--- a/secure/usr.sbin/tests/Makefile
+++ b/secure/usr.sbin/tests/Makefile
@@ -2,9 +2,7 @@
.include <bsd.own.mk>
-TESTSDIR= ${TESTSBASE}/secure/usr.sbin
-
-.PATH: ${.CURDIR:H:H:H}/tests
+.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>
OpenPOWER on IntegriCloud