Index: user/ngie/more-tests2/share/mk/netbsd-tests.test.mk
===================================================================
--- user/ngie/more-tests2/share/mk/netbsd-tests.test.mk	(revision 288939)
+++ user/ngie/more-tests2/share/mk/netbsd-tests.test.mk	(revision 288940)
@@ -1,46 +1,42 @@
 # $FreeBSD$
 
 .if !target(__netbsd_tests.test.mk__)
 __netbsd_tests.test.mk__:
 
-.if !defined(OBJTOP)
-.error "Please define OBJTOP to the absolute path of the top of the object tree"
-.endif
+OBJROOT?=	${.OBJDIR:S/${RELDIR}//}
 
-.if !defined(SRCTOP)
-.error "Please define SRCTOP to the absolute path of the top of the source tree"
-.endif
+TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
 
-.if !defined(TESTSRC)
-.error "Please define TESTSRC to the absolute path of the test sources, e.g. contrib/netbsd-tests/lib/libc/stdio"
+.if !exists(${TESTSRC}/)
+.error "Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio"
 .endif
 
 .PATH: ${TESTSRC}
 
 LIBNETBSD_SRCDIR=	${SRCTOP}/lib/libnetbsd
-LIBNETBSD_OBJDIR=	${OBJTOP}/lib/libnetbsd
+LIBNETBSD_OBJDIR=	${OBJROOT}/lib/libnetbsd
 
 .for t in ${NETBSD_ATF_TESTS_C}
 CFLAGS.$t+=	-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
 LDFLAGS.$t+=	-L${LIBNETBSD_OBJDIR}
 
 DPADD.$t+=	${LIBNETBSD}
 LDADD.$t+=	-lnetbsd
 
 SRCS.$t?=	${t:C/^/t_/:C/_test$//g}.c
 .endfor
 
 ATF_TESTS_C+=	${NETBSD_ATF_TESTS_C}
 
 # A C++ analog isn't provided because there aren't any C++ testcases in
 # contrib/netbsd-tests
 
 .for t in ${NETBSD_ATF_TESTS_SH}
 ATF_TESTS_SH_SRC_$t?=	${t:C/^/t_/:C/_test$//g}.sh
 .endfor
 
 ATF_TESTS_SH+=	${NETBSD_ATF_TESTS_SH}
 
 .endif
 
 # vim: syntax=make
Index: user/ngie/more-tests2/share
===================================================================
--- user/ngie/more-tests2/share	(revision 288939)
+++ user/ngie/more-tests2/share	(revision 288940)

Property changes on: user/ngie/more-tests2/share
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /user/ngie/more-tests/share:r288931
Index: user/ngie/more-tests2
===================================================================
--- user/ngie/more-tests2	(revision 288939)
+++ user/ngie/more-tests2	(revision 288940)

Property changes on: user/ngie/more-tests2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /user/ngie/more-tests:r288931