From owner-svn-src-projects@freebsd.org Tue Oct 31 07:16:20 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 541B8E50A8D for ; Tue, 31 Oct 2017 07:16:20 +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 09A776676E; Tue, 31 Oct 2017 07:16:19 +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 v9V7GJ9W026963; Tue, 31 Oct 2017 07:16:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9V7GJqZ026962; Tue, 31 Oct 2017 07:16:19 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710310716.v9V7GJqZ026962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 31 Oct 2017 07:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325219 - projects/runtime-coverage/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/runtime-coverage/share/mk X-SVN-Commit-Revision: 325219 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: Tue, 31 Oct 2017 07:16:20 -0000 Author: ngie Date: Tue Oct 31 07:16:18 2017 New Revision: 325219 URL: https://svnweb.freebsd.org/changeset/base/325219 Log: Checkpoint work to integrate coverage and make check together Modified: projects/runtime-coverage/share/mk/suite.test.mk Modified: projects/runtime-coverage/share/mk/suite.test.mk ============================================================================== --- projects/runtime-coverage/share/mk/suite.test.mk Tue Oct 31 06:59:28 2017 (r325218) +++ projects/runtime-coverage/share/mk/suite.test.mk Tue Oct 31 07:16:18 2017 (r325219) @@ -79,6 +79,41 @@ Kyuafile: Makefile KYUA= ${LOCALBASE}/bin/kyua +MAKE_CHECK_SANDBOX_DIR= ${.OBJDIR}/checkdir +CLEANDIRS+= ${MAKE_CHECK_SANDBOX_DIR} + +.if ${MK_MAKE_CHECK_USE_SANDBOX} != "no" && make(check) +DESTDIR:= ${MAKE_CHECK_SANDBOX_DIR} + +.if ${MK_MAKE_CHECK_TEST_WITH_COVERAGE} != "no" +GCOV?= gcov +GCOV_PREFIX?= + +TESTS_ENV+= GCOV=${GCOV} GCOV_PREFIX=${GCOV_PREFIX} +.endif + +beforecheck: +.for t in clean depend all +.for dir in ${SRCTOP}/tests/tools ${.CURDIR} + @cd ${dir} && ${MAKE} $t +.endfor +.endfor + @cd ${SRCTOP} && ${MAKE} hierarchy DESTDIR=${DESTDIR} +.for dir in ${SRCTOP}/tests/tools ${.CURDIR} + @cd ${dir} && ${MAKE} install DESTDIR=${DESTDIR} +.endfor + +# NOTE: this is intentional to ensure that "make check" can be run multiple +# times. "aftercheck" won't be run if "make check" fails, is interrupted, +# etc. +aftercheck: + find ${GCOV_PREFIX} -name \*.gcda +.if ${MK_MAKE_CHECK_TEST_WITH_COVERAGE} != "no" + @env ${TESTS_ENV:Q} ${TESTSBASE}/tools/gather_coverage +.endif + @cd ${.CURDIR} && ${MAKE} clean +.endif + # Definition of the "make check" target and supporting variables. # # This target, by necessity, can only work for native builds (i.e. a FreeBSD @@ -99,26 +134,5 @@ realcheck: .PHONY echo "LOCALBASE=\"${LOCALBASE}\""; \ false; \ fi - @env ${TESTS_ENV:Q} ${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile - -MAKE_CHECK_SANDBOX_DIR= ${.OBJDIR}/checkdir -CLEANDIRS+= ${MAKE_CHECK_SANDBOX_DIR} - -.if ${MK_MAKE_CHECK_USE_SANDBOX} != "no" && make(check) -DESTDIR:= ${MAKE_CHECK_SANDBOX_DIR} - -beforecheck: -.for t in clean depend all - @cd ${.CURDIR} && ${MAKE} $t -.endfor - @cd ${SRCTOP} && ${MAKE} hierarchy DESTDIR=${DESTDIR} - @cd ${.CURDIR} && ${MAKE} install \ - DESTDIR=${DESTDIR} - -# NOTE: this is intentional to ensure that "make check" can be run multiple -# times. "aftercheck" won't be run if "make check" fails, is interrupted, -# etc. -aftercheck: - @cd ${.CURDIR} && ${MAKE} clean - -.endif + @env ${TESTS_ENV:Q} ${KYUA} test ${KYUA_VARIABLES} \ + -k ${DESTDIR}${TESTSDIR}/Kyuafile