Date: Mon, 6 Nov 2017 04:41:51 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r325466 - projects/runtime-coverage/share/mk Message-ID: <201711060441.vA64fpkt065193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711060441.vA64fpkt065193>