From owner-svn-src-projects@freebsd.org Mon Nov 6 04:41:52 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 35CE1E5987A for ; Mon, 6 Nov 2017 04:41:52 +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 03D437C5E2; Mon, 6 Nov 2017 04:41:51 +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 vA64fpp3065194; Mon, 6 Nov 2017 04:41:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA64fpkt065193; Mon, 6 Nov 2017 04:41:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201711060441.vA64fpkt065193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 6 Nov 2017 04:41:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325466 - 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: 325466 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: Mon, 06 Nov 2017 04:41:52 -0000 Author: ngie Date: Mon Nov 6 04:41:50 2017 New Revision: 325466 URL: https://svnweb.freebsd.org/changeset/base/325466 Log: Default GCOV_PREFIX to DESTDIR, use gather_coverage from DESTDIR, etc This works by itself, when not executed as kyua, but unfortunately there's something in the atf/kyua stack that's preventing GCOV_PREFIX from being passed down, so, programs are failing with EPERM issues when trying to look for .gcda files and write to .gcno files on the host. 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 Mon Nov 6 02:59:19 2017 (r325465) +++ projects/runtime-coverage/share/mk/suite.test.mk Mon Nov 6 04:41:50 2017 (r325466) @@ -87,8 +87,7 @@ DESTDIR:= ${.OBJDIR}/${MAKE_CHECK_SANDBOX_DIR} .if ${MK_MAKE_CHECK_TEST_WITH_COVERAGE} != "no" GCOV?= gcov -GCOV_PREFIX?= - +GCOV_PREFIX?= ${DESTDIR} TESTS_ENV+= GCOV=${GCOV} GCOV_PREFIX=${GCOV_PREFIX} .endif @@ -107,9 +106,8 @@ beforecheck: # 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 + @env ${TESTS_ENV:Q} ${DESTDIR}${TESTSBASE}/tools/gather_coverage .endif @cd ${.CURDIR} && ${MAKE} clean .endif