Refactor the test/ Makefiles after recent changes to bsd.test.mk (r28…

…9158) 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
kravietz · Oct 12, 2015 · b2d48be · b2d48be
1 parent 4f4a7a0
commit b2d48be
Show file tree

Hide file tree

Showing 121 changed files with 69 additions and 321 deletions.
diff --git a/bin/cat/tests/Makefile b/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}

diff --git a/bin/date/tests/Makefile b/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>
diff --git a/bin/expr/tests/Makefile b/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'

diff --git a/bin/ls/tests/Makefile b/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

diff --git a/bin/mv/tests/Makefile b/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>
diff --git a/bin/pax/tests/Makefile b/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>
diff --git a/bin/pkill/tests/Makefile b/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

diff --git a/bin/sh/tests/Makefile b/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

diff --git a/bin/sleep/tests/Makefile b/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
-ATF_TESTS_SH=	sleep_test
-ATF_TESTS_SH_SRC_sleep_test=	t_sleep.sh
+NETBSD_ATF_TESTS_SH=	sleep_test
 
 .include <bsd.test.mk>
diff --git a/bin/test/tests/Makefile b/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.

diff --git a/bin/tests/Makefile b/bin/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/bin
-
-.PATH:		${.CURDIR:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/lib
-
-.PATH:		${.CURDIR:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/sbin
-
-.PATH:		${.CURDIR:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl
-
-.PATH:		${.CURDIR:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/usr.bin
-
-.PATH:		${.CURDIR:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/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

diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/cddl/usr.sbin
-
-.PATH:		${.CURDIR:H:H:H}/tests
+.PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 
 .include <bsd.test.mk>
diff --git 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
@@ -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
@@ -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
@@ -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>
diff --git a/lib/atf/libatf-c++/tests/Makefile b/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
 

diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/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"'

diff --git a/lib/atf/libatf-c/tests/Makefile b/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
 

diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/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}"'

diff --git a/lib/atf/tests/Makefile b/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

diff --git a/lib/atf/tests/test-programs/Makefile b/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}

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

diff --git a/lib/libc/tests/Makefile.netbsd-tests b/lib/libc/tests/Makefile.netbsd-tests
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-OBJTOP?=	${.OBJDIR:H:H:H:H}
-SRCTOP?=	${.CURDIR:H:H:H:H}
-TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/lib/libc/${.CURDIR:T}
+TESTSRC:=	${SRCTOP}/contrib/netbsd-tests/${RELDIR:C/libc\/tests/libc/}
+
+TESTSDIR:=	${TESTSBASE}/${RELDIR:C/libc\/tests/libc/}
 
 .include <netbsd-tests.test.mk>
diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/c063
-
 #TODO: t_o_search
 
 NETBSD_ATF_TESTS_C=	faccessat

diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=	${TESTSBASE}/lib/libc/db
-
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_db

diff --git a/lib/libc/tests/gen/Makefile b/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
 

diff --git a/lib/libc/tests/gen/execve/Makefile b/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"

diff --git a/lib/libc/tests/gen/posix_spawn/Makefile b/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

diff --git a/lib/libc/tests/hash/Makefile b/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${.CURDIR}/../../../../crypto/openssh
+CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh/openbsd-compat
+CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh
 
 .include "../Makefile.netbsd-tests"
 

diff --git a/lib/libc/tests/inet/Makefile b/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"