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

bin/cat/tests/Makefile

@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR}/../../..
-SRCTOP=		${.CURDIR}/../../..
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/bin/cat
-
-TESTSDIR=	${TESTSBASE}/bin/cat
-
 NETBSD_ATF_TESTS_SH=		cat_test
 
 FILESDIR=	${TESTSDIR}

bin/date/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/date
-
 ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>

bin/expr/tests/Makefile

@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR}/../../..
-SRCTOP=		${.CURDIR}/../../..
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/bin/expr
-
-TESTSDIR=	${TESTSBASE}/bin/expr
-
 NETBSD_ATF_TESTS_SH=	expr_test
 
 ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'

bin/ls/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/bin/ls
-
 ATF_TESTS_SH+=	ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root

bin/mv/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/mv
-
 TAP_TESTS_SH=	legacy_test
 
 .include <bsd.test.mk>

bin/pax/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/pax
-
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>

bin/pkill/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/pkill
-
 TAP_TESTS_SH=			pgrep-F_test
 TAP_TESTS_SH+=			pgrep-LF_test
 TAP_TESTS_SH+=			pgrep-P_test

bin/sh/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/sh
-
 TESTS_SUBDIRS+=	builtins
 TESTS_SUBDIRS+=	errors
 TESTS_SUBDIRS+=	execution

bin/sleep/tests/Makefile

@@ -1,12 +1,7 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/sleep
+NETBSD_ATF_TESTS_SH=	sleep_test
-ATF_TESTS_SH=	sleep_test
-ATF_TESTS_SH_SRC_sleep_test=	t_sleep.sh
 
 .include <bsd.test.mk>

bin/test/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin/test
-
 TAP_TESTS_SH=	legacy_test
 # Some tests in here are silently not run when the tests are executed as
 # root.  Explicitly tell Kyua to drop privileges.

bin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

cddl/lib/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/lib
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

cddl/sbin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/sbin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

cddl/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

cddl/usr.bin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/usr.bin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

cddl/usr.sbin/dtrace/tests/Makefile

@@ -2,10 +2,9 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/usr.sbin/dtrace
 TESTS_SUBDIRS+=	common
 
-.PATH:		${.CURDIR:H:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	YES
 
 .PATH:		${.CURDIR}/tools

cddl/usr.sbin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/usr.sbin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

gnu/lib/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/gnu/lib
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

gnu/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/gnu
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

gnu/usr.bin/diff/tests/Makefile

@@ -1,17 +1,14 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff
+TESTSRC=	${SRCTOP}/contrib/netbsd-tests/usr.bin/diff
-.PATH: ${TESTSRC}
 
-.include <bsd.own.mk>
+NETBSD_ATF_TESTS_SH=	diff_test
-
-TESTSDIR=	${TESTSBASE}/gnu/usr.bin/diff
-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>

gnu/usr.bin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/gnu/usr.bin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

lib/atf/libatf-c++/tests/Makefile

@@ -2,10 +2,9 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++
 TESTS_SUBDIRS=	detail
 
-ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
 

lib/atf/libatf-c++/tests/detail/Makefile

@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
 
-ATF=		${.CURDIR:H:H:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c++/detail
 
 CFLAGS+=	-DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'

lib/atf/libatf-c/tests/Makefile

@@ -2,10 +2,9 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c
 TESTS_SUBDIRS=	detail
 
-ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
 

lib/atf/libatf-c/tests/detail/Makefile

@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail
 
-ATF=		${.CURDIR:H:H:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-c/detail
 
 CFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'

lib/atf/tests/Makefile

@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/lib/atf
 
-.PATH:		${.CURDIR:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 SUBDIR=		test-programs

lib/atf/tests/test-programs/Makefile

@@ -5,7 +5,7 @@
 TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
 KYUAFILE=	yes
 
-ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/test-programs
 
 CFLAGS+=	-I${ATF}

lib/libc/tests/Makefile

@@ -2,8 +2,6 @@
 
 .include <src.opts.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc
-
 SUBDIR=		tls_dso
 
 TESTS_SUBDIRS=	c063

lib/libc/tests/Makefile.netbsd-tests

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-OBJTOP?=	${.OBJDIR:H:H:H:H}
+TESTSRC:=	${SRCTOP}/contrib/netbsd-tests/${RELDIR:C/libc\/tests/libc/}
-SRCTOP?=	${.CURDIR:H:H:H:H}
+
-TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/lib/libc/${.CURDIR:T}
+TESTSDIR:=	${TESTSBASE}/${RELDIR:C/libc\/tests/libc/}
 
 .include <netbsd-tests.test.mk>

lib/libc/tests/c063/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/c063
-
 #TODO: t_o_search
 
 NETBSD_ATF_TESTS_C=	faccessat

lib/libc/tests/db/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/db
-
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_db

lib/libc/tests/gen/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/gen
-
 ATF_TESTS_C=		arc4random_test
 ATF_TESTS_C+=		fpclassify2_test
 

lib/libc/tests/gen/execve/Makefile

@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/gen/execve
-
 NETBSD_ATF_TESTS_C=	execve_test
 
 .include "../../Makefile.netbsd-tests"

lib/libc/tests/gen/posix_spawn/Makefile

@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/gen/posix_spawn
-
 BINDIR=		${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=	fileactions_test

lib/libc/tests/hash/Makefile

@@ -2,8 +2,6 @@
 
 .include <src.opts.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/hash
-
 NETBSD_ATF_TESTS_C=
 
 .if ${MK_OPENSSL} != "no"
@@ -29,8 +27,8 @@ LDADD+=		-lmd
 DPADD.sha2_test+=	${LIBCRYPTO}
 LDADD.sha2_test+=	-lcrypto
 
-CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh/openbsd-compat
+CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh/openbsd-compat
-CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh
+CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh
 
 .include "../Makefile.netbsd-tests"
 

lib/libc/tests/inet/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/inet
-
 NETBSD_ATF_TESTS_C=	inet_network_test
 
 .include "../Makefile.netbsd-tests"

lib/libc/tests/locale/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/locale
-
 NETBSD_ATF_TESTS_C=	io_test
 NETBSD_ATF_TESTS_C+=	mbrtowc_test
 NETBSD_ATF_TESTS_C+=	mbstowcs_test

lib/libc/tests/net/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/net
-
 BINDIR=		${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=	getprotoent_test

lib/libc/tests/net/getaddrinfo/Makefile

@@ -1,13 +1,9 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/net/getaddrinfo
-
 BINDIR=		${TESTSDIR}
 
 .error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)"

lib/libc/tests/regex/Makefile

@@ -4,8 +4,6 @@
 
 BINDIR=		${TESTSDIR}
 
-TESTSDIR=	${TESTSBASE}/lib/libc/regex
-
 IMPLEMENTATION?=      -DREGEX_SPENCER
 
 CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex

lib/libc/tests/rpc/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=		${TESTSBASE}/lib/libc/rpc
 SRCS.xdr_test=		${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h}
 
 NETBSD_ATF_TESTS_C=	rpc_test

lib/libc/tests/setjmp/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/setjmp
-
 NETBSD_ATF_TESTS_C=	t_setjmp
 NETBSD_ATF_TESTS_C+=	t_threadjmp
 
@@ -10,4 +8,6 @@ LDADD.t_threadjmp+= -lpthread
 
 WARNS?=	4
 
+.include "../Makefile.netbsd-tests"
+
 .include <bsd.test.mk>

lib/libc/tests/ssp/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/ssp
-
 NO_WERROR=
 WARNS?=	2
 

lib/libc/tests/stdio/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/stdio
-
 ATF_TESTS_C=		fmemopen2_test
 
 NETBSD_ATF_TESTS_C=	clearerr_test

lib/libc/tests/stdlib/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/stdlib
-
 # TODO: t_getenv_thread, t_mi_vector_hash
 NETBSD_ATF_TESTS_C=	abs_test
 NETBSD_ATF_TESTS_C+=	atoi_test

lib/libc/tests/string/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/string
-
 # TODO: popcount, stresep
 
 NETBSD_ATF_TESTS_C+=	memchr

lib/libc/tests/sys/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=		${TESTSBASE}/lib/libc/sys
-
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
 # swapcontext
 NETBSD_ATF_TESTS_C+=		access_test

lib/libc/tests/termios/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/termios
-
 NETBSD_ATF_TESTS_C=	tcsetpgrp_test
 
 .include "../Makefile.netbsd-tests"

lib/libc/tests/time/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/time
-
 NETBSD_ATF_TESTS_C=	mktime_test
 NETBSD_ATF_TESTS_C+=	strptime_test
 

lib/libc/tests/tls/Makefile

@@ -2,7 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/tls
 .if !defined(NO_PIC)
 SUBDIR+=	dso
 .endif

lib/libc/tests/tls/dso/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 
 LIB=		h_tls_dlopen

lib/libc/tests/tls_dso/Makefile

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+SRCDIR=		${SRCTOP}/contrib/netbsd/
+
 .include <bsd.own.mk>
 
 LIB=		h_tls_dynamic

lib/libc/tests/ttyio/Makefile

@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib/libc/ttyio
-
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=	ttyio_test
 

lib/libcrypt/tests/Makefile

@@ -2,8 +2,6 @@
 
 # exercise libcrypt
 
-TESTSDIR= ${TESTSBASE}/lib/libcrypt
-
 ATF_TESTS_C= crypt_tests
 
 CFLAGS+= -I${.CURDIR:H}

lib/libmp/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libmp
-
 TAP_TESTS_C+=	legacy_test
 
 LIBADD+=	mp

lib/libnv/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libnv
-
 ATF_TESTS_CXX=	\
 	dnv_tests \
 	nv_array_tests \

lib/libpam/libpam/tests/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-OPENPAM = ${.CURDIR}/../../../../contrib/openpam
+OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/t
 
 TESTSDIR = ${TESTSBASE}/lib/libpam

lib/libproc/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libproc
-
 ATF_TESTS_C+=	proc_test
 
 PROGS=		target_prog
@@ -15,7 +13,6 @@ DPADD+=	${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL}
 # for testing symbol lookup.
 STRIP=
 
-MAN=
 WARNS?=	6
 
 .include <bsd.test.mk>

lib/librt/tests/Makefile

@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/librt
-
-TESTSDIR=	${TESTSBASE}/lib/librt
-
 LIBADD=	rt
 
 NETBSD_ATF_TESTS_C=	sched_test

lib/libthr/tests/Makefile

@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread
 
-TESTSDIR=	${TESTSBASE}/lib/libthr
-
 # TODO: t_name (missing pthread_getname_np support in FreeBSD)
 NETBSD_ATF_TESTS_C=	barrier_test
 NETBSD_ATF_TESTS_C+=	cond_test

lib/libthr/tests/dlopen/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen
 
 .include <bsd.own.mk>

lib/libthr/tests/dlopen/dso/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso
 
 SHLIB=		h_pthread_dlopen

lib/libutil/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libutil
-
 TAP_TESTS_C+=	flopen_test
 TAP_TESTS_C+=	grp_test
 TAP_TESTS_C+=	humanize_number_test

lib/msun/tests/Makefile

@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libm
 
-TESTSDIR=	${TESTSBASE}/lib/msun
-
 # All architectures on FreeBSD have fenv.h
 CFLAGS+=	-DHAVE_FENV_H
 

lib/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/lib
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

libexec/atf/atf-check/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=	${TESTSBASE}/libexec/atf/atf-check
+ATF=		${SRCTOP}/contrib/atf
-
-ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 ATF_TESTS_SH=	atf-check_test

libexec/atf/atf-sh/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=	${TESTSBASE}/libexec/atf/atf-sh
+ATF=		${SRCTOP}/contrib/atf
-
-ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 ATF_TESTS_SH+=	atf_check_test

libexec/atf/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/libexec/atf
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

libexec/rtld-elf/tests/Makefile

@@ -2,7 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/libexec/rtld-elf
 SUBDIR+=	libpythagoras target
 
 ATF_TESTS_C=	ld_library_pathfds

libexec/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/libexec
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

sbin/devd/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/sbin/devd
-
 ATF_TESTS_C=	client_test
 TEST_METADATA.client_test=	required_programs="devd"
 TEST_METADATA.client_test+=	required_user="root"

sbin/dhclient/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/sbin/dhclient
-
 .PATH:	${.CURDIR}/..
 
 PLAIN_TESTS_C=				option-domain-search_test

sbin/growfs/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/sbin/growfs
-
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>

sbin/ifconfig/tests/Makefile

@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=		${.OBJDIR}/../../..
-SRCTOP=		${.CURDIR}/../../..
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/sbin/ifconfig
-
-TESTSDIR=	${TESTSBASE}/sbin/ifconfig
-
 NETBSD_ATF_TESTS_SH=		nonexistent_test
 
 .include <netbsd-tests.test.mk>

sbin/mdconfig/tests/Makefile

@@ -1,10 +1,7 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/sbin/mdconfig
-
 ATF_TESTS_SH=	mdconfig_test
 
-
 TEST_METADATA.mdconfig_test+=	required_user="root"
 
 .include <bsd.test.mk>

sbin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/sbin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

secure/lib/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/secure/lib
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

secure/libexec/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/secure/libexec
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

secure/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/secure
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

secure/usr.bin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/secure/usr.bin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

secure/usr.sbin/tests/Makefile

@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/secure/usr.sbin
+.PATH:		${SRCTOP}/tests
-
-.PATH:		${.CURDIR:H:H:H}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

share/examples/tests/Makefile

@@ -2,11 +2,9 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/share/examples
-
 SUBDIR=		tests
 
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
-.PATH:		${.CURDIR:H:H:H}/tests
 
 .include <bsd.test.mk>

share/tests/Makefile

@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/share
 
-.PATH:		${.CURDIR:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>

tests/etc/Makefile

@@ -4,7 +4,7 @@
 
 TESTSDIR=	${TESTSBASE}/etc
 
-.PATH:		${.CURDIR:H}
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 SUBDIR+=	rc.d

tests/sys/mqueue/Makefile

@@ -6,7 +6,7 @@ ATF_TESTS_SH=	mqueue_test
 
 BINDIR=		${TESTSDIR}
 
-CFLAGS+=	-I${.CURDIR:H:H}
+CFLAGS+=	-I${SRCTOP}/tests
 
 PROGS+=		mqtest1
 PROGS+=		mqtest2

tests/sys/pjdfstest/tests/Makefile

@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PJDFSTEST_SRCDIR=	${.CURDIR:H:H:H:H}/contrib/pjdfstest
+PJDFSTEST_SRCDIR=	${SRCTOP}/contrib/pjdfstest
 
 TESTSDIR=	${TESTSBASE}/sys/pjdfstest
 

usr.bin/apply/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/apply
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}

usr.bin/basename/tests/Makefile

@@ -1,12 +1,7 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/basename
+NETBSD_ATF_TESTS_SH=	basename_test
-.PATH: ${TESTSRC}
 
-.include <bsd.own.mk>
+.include <netbsd-tests.test.mk>
-
-TESTSDIR=	${TESTSBASE}/usr.bin/basename
-ATF_TESTS_SH=	basename_test
-ATF_TESTS_SH_SRC_basename_test=	t_basename.sh
 
 .include <bsd.test.mk>

usr.bin/calendar/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/calendar
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}

usr.bin/cmp/tests/Makefile

@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cmp
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/cmp
+NETBSD_ATF_TESTS_SH=	cmp_test
-ATF_TESTS_SH=	cmp_test
+
-ATF_TESTS_SH_SRC_cmp_test=	t_cmp.sh
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>

usr.bin/col/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/col
-
 ATF_TESTS_SH=	col
 
 FILES=		rlf.in \

usr.bin/comm/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/comm
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}

usr.bin/cut/tests/Makefile

@@ -1,13 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cut
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/cut
+NETBSD_ATF_TESTS_SH=	cut_test
-ATF_TESTS_SH=	cut_test
-ATF_TESTS_SH_SRC_cut_test=	t_cut.sh
 
 FILESDIR=	${TESTSDIR}
 FILES=		d_basic.out
@@ -18,4 +13,6 @@ FILES+=		d_latin1.in
 FILES+=		d_sflag.out
 FILES+=		d_utf8.in
 
+.include <netbsd-tests.test.mk>
+
 .include <bsd.test.mk>

usr.bin/dirname/tests/Makefile

@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/dirname
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/dirname
+NETBSD_ATF_TESTS_SH=	dirname_test
-ATF_TESTS_SH=	dirname_test
+
-ATF_TESTS_SH_SRC_dirname_test=	t_dirname.sh
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>

usr.bin/file2c/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/file2c
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}

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
+NETBSD_ATF_TESTS_SH=	grep_test
-
-ATF_TESTS_SH=	grep_test
-ATF_TESTS_SH_SRC_grep_test=	t_grep.sh
 
 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>

usr.bin/gzip/tests/Makefile

@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=	${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/gzip
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/gzip
+NETBSD_ATF_TESTS_SH=	gzip_test
-ATF_TESTS_SH=	gzip_test
+
-ATF_TESTS_SH_SRC_gzip_test=	t_gzip.sh
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>

usr.bin/ident/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/ident
-
 ATF_TESTS_SH=	ident
 FILES=		test.in \
 		test.out \

usr.bin/join/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/join
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}

usr.bin/jot/tests/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/usr.bin/jot
-
 TAP_TESTS_SH=	legacy_test
 
 FILESDIR=	${TESTSDIR}