Date: Wed, 2 Aug 2017 03:18:24 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r321903 - projects/make-check-sandbox/share/mk Message-ID: <201708020318.v723IOmU089559@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.dep.mk> .include <bsd.clang-analyze.mk> .include <bsd.obj.mk> 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 <bsd.man.mk> .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708020318.v723IOmU089559>