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

6 files changed, 6 insertions, 8 deletions

diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
index 5f5a575..a069bb1 100644
--- 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
index 69c3e7b..f7d672e 100644
--- 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
index d5b6dc0..e864c2e 100644
--- 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
index 02c1f2b..e47fd56 100644
--- 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
index 7bc96c9..dc79bb3 100644
--- 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
index b0c1c23..aa30826 100644
--- 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}