From owner-svn-src-user@freebsd.org  Tue Oct  6 17:08:32 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 0E7019B63B7
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue,  6 Oct 2015 17:08:32 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 F3FBC23F;
 Tue,  6 Oct 2015 17:08:31 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t96H8VNV060348;
 Tue, 6 Oct 2015 17:08:31 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96H8V1W060347;
 Tue, 6 Oct 2015 17:08:31 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201510061708.t96H8V1W060347@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: Tue, 6 Oct 2015 17:08:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r288931 - user/ngie/more-tests/share/mk
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2015 17:08:32 -0000

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

Log:
  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-tests/share/mk/netbsd-tests.test.mk

Modified: user/ngie/more-tests/share/mk/netbsd-tests.test.mk
==============================================================================
--- user/ngie/more-tests/share/mk/netbsd-tests.test.mk	Tue Oct  6 17:07:30 2015	(r288930)
+++ user/ngie/more-tests/share/mk/netbsd-tests.test.mk	Tue Oct  6 17:08:31 2015	(r288931)
@@ -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