From owner-svn-src-user@freebsd.org Tue Oct 6 17:46:18 2015 Return-Path: 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 D1ED39B6040 for ; Tue, 6 Oct 2015 17:46:18 +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 8719B961; Tue, 6 Oct 2015 17:46:18 +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 t96HkHMV068870; Tue, 6 Oct 2015 17:46:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96HkHDd068869; Tue, 6 Oct 2015 17:46:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510061746.t96HkHDd068869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 6 Oct 2015 17:46:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r288940 - user/ngie/more-tests2/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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Oct 2015 17:46:18 -0000 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