From dd1f61836762d6bb73b65e51a11b769b15667412 Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
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
---
 usr.bin/grep/tests/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'usr.bin/grep')

diff --git a/usr.bin/grep/tests/Makefile b/usr.bin/grep/tests/Makefile
index 59b948c..7744fcb 100644
--- a/usr.bin/grep/tests/Makefile
+++ b/usr.bin/grep/tests/Makefile
@@ -1,14 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/grep
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/grep
-
-ATF_TESTS_SH=	grep_test
-ATF_TESTS_SH_SRC_grep_test=	t_grep.sh
+NETBSD_ATF_TESTS_SH=	grep_test
 
 FILESDIR=	${TESTSDIR}
 FILES=		d_basic.out
@@ -38,4 +32,6 @@ FILES+=		d_whole_line.out
 FILES+=		d_word_regexps.out
 FILES+=		d_zgrep.out
 
+.include <netbsd-tests.test.mk>
+
 .include <bsd.test.mk>
-- 
cgit v1.1