svn commit: r288940 - user/ngie/more-tests2/share/mk

[Garrett Cooper]

Author: ngie
Date: Tue Oct  6 17:46:17 2015
New Revision: 288940
URL: https://svnweb.freebsd.org/changeset/base/288940

Log:
  ------------------------------------------------------------------------
  r288931 | ngie | 2015-10-06 10:08:31 -0700 (Tue, 06 Oct 2015) | 10 lines
  
  Simplify netbsd-tests.test.mk
  
  - projects/bmake and subsequent commits provide SRCTOP; there's no need to
    manually specify it now.
  - Use OBJROOT, not OBJDIR for defining MAKEOBJDIRPREFIX relative paths as a
    followup to projects/bmake.
  - Compute a sane default for TESTSRC
  
  MFC after: 2 weeks
  
  ------------------------------------------------------------------------

Modified:
  user/ngie/more-tests2/share/mk/netbsd-tests.test.mk
Directory Properties:
  user/ngie/more-tests2/   (props changed)
  user/ngie/more-tests2/share/   (props changed)

Modified: user/ngie/more-tests2/share/mk/netbsd-tests.test.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/netbsd-tests.test.mk	Tue Oct  6 17:45:37 2015	(r288939)
+++ user/ngie/more-tests2/share/mk/netbsd-tests.test.mk	Tue Oct  6 17:46:17 2015	(r288940)
@@ -3,22 +3,18 @@
 .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