aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-10-15 17:36:56 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-10-15 17:36:56 +0000
commit324fd1ce05f53780fdbb8e13a09181aa2402ea86 (patch)
tree938919dc21bad97a2e96d808270dd31b2c871668 /gnu
parenta2fef6b9c1dff4b8d579b6b81966980e84e325c3 (diff)
parent4d45a6738ae207e82d54b9472cdc277974cb55c2 (diff)
Notes
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/tests/Makefile4
-rw-r--r--gnu/tests/Makefile4
-rw-r--r--gnu/usr.bin/diff/tests/Makefile11
-rw-r--r--gnu/usr.bin/tests/Makefile4
4 files changed, 7 insertions, 16 deletions
diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile
index 256e24512e30..a0e63e5da42a 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 de42fae1ec00..a0e63e5da42a 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 aa1629d33f53..16439b3b61fe 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 eebbff675d2e..a0e63e5da42a 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>