From 6b3722162f25f17568ac341320ee8e7ede42bc7e Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Thu, 9 Feb 2017 22:49:48 +0000
Subject: 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)
---
 gnu/usr.bin/diff/tests/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'gnu/usr.bin/diff/tests')

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>
-- 
cgit v1.1