svn commit: r289151 - head/share/mk

[Garrett Cooper]

Author: ngie
Date: Sun Oct 11 20:02:10 2015
New Revision: 289151
URL: https://svnweb.freebsd.org/changeset/base/289151

Log:
  Simplify netbsd-tests.test.mk
  
  - projects/bmake and subsequent commits provide SRCTOP; there's no need to
    manually specify it now.
  - Compute a sane default for OBJTOP based on .OBJDIR and RELDIR. Manually
    specifying this is probably no longer needed, but it persists just in case
    (supporting commits will need to be made to move it out of some of the meta
    .mk files).
  - Compute a sane default for TESTSRC. Error out if the path cannot be found.
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/share/mk/netbsd-tests.test.mk
Directory Properties:
  head/   (props changed)

Modified: head/share/mk/netbsd-tests.test.mk
==============================================================================
--- head/share/mk/netbsd-tests.test.mk	Sun Oct 11 19:58:57 2015	(r289150)
+++ head/share/mk/netbsd-tests.test.mk	Sun Oct 11 20:02:10 2015	(r289151)
@@ -3,16 +3,12 @@
 .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
+OBJTOP?=	${.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}