From owner-svn-src-head@freebsd.org  Sun Oct 11 20:02:12 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DA6EA11127;
 Sun, 11 Oct 2015 20:02:12 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8C13F1B07;
 Sun, 11 Oct 2015 20:02:11 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9BK2AKc072157;
 Sun, 11 Oct 2015 20:02:10 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9BK2Aob072156;
 Sun, 11 Oct 2015 20:02:10 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510112002.t9BK2Aob072156@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 11 Oct 2015 20:02:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289151 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Oct 2015 20:02:12 -0000

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}