From owner-svn-src-projects@freebsd.org Wed Aug 2 03:18:25 2017 Return-Path: Delivered-To: svn-src-projects@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 82D6BDC4050 for ; Wed, 2 Aug 2017 03:18:25 +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 42DEF7315D; Wed, 2 Aug 2017 03:18:25 +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 v723IO0E089561; Wed, 2 Aug 2017 03:18:24 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v723IOmU089559; Wed, 2 Aug 2017 03:18:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201708020318.v723IOmU089559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 2 Aug 2017 03:18:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321903 - projects/make-check-sandbox/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/make-check-sandbox/share/mk X-SVN-Commit-Revision: 321903 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Aug 2017 03:18:25 -0000 Author: ngie Date: Wed Aug 2 03:18:24 2017 New Revision: 321903 URL: https://svnweb.freebsd.org/changeset/base/321903 Log: Hook HAS_TESTS (r321901) in to bsd.lib.mk and bsd.prog.mk Apply the required sugar to make "make check" just work (tm) when invoked from a subdirectory where HAS_TESTS is defined in the relevant Makefile. Adjust $LD_LIBRARY_PATH and $PATH appropriately from bsd.lib.mk and bsd.prog.mk to make the "user experience" more out of the box/seamless. Modified: projects/make-check-sandbox/share/mk/bsd.lib.mk projects/make-check-sandbox/share/mk/bsd.prog.mk Modified: projects/make-check-sandbox/share/mk/bsd.lib.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.lib.mk Wed Aug 2 03:09:55 2017 (r321902) +++ projects/make-check-sandbox/share/mk/bsd.lib.mk Wed Aug 2 03:18:24 2017 (r321903) @@ -442,6 +442,12 @@ OBJS_DEPEND_GUESS.${_S:R}.pico+= ${_S} .endfor .endif +.if defined(HAS_TESTS) +MAKE+= -D_TESTS_USE_OBJDIR +SUBDIR_TARGETS+= check +TESTS_LD_LIBRARY_PATH+= ${.OBJDIR} +.endif + .include .include .include Modified: projects/make-check-sandbox/share/mk/bsd.prog.mk ============================================================================== --- projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 03:09:55 2017 (r321902) +++ projects/make-check-sandbox/share/mk/bsd.prog.mk Wed Aug 2 03:18:24 2017 (r321903) @@ -305,6 +305,13 @@ lint: ${SRCS:M*.c} .include .endif +.if defined(HAS_TESTS) +MAKE+= -D_TESTS_USE_OBJDIR +SUBDIR_TARGETS+= check +TESTS_LD_LIBRARY_PATH+= ${.OBJDIR} +TESTS_PATH+= ${.OBJDIR} +.endif + .if defined(PROG) OBJS_DEPEND_GUESS+= ${SRCS:M*.h} .endif