From owner-svn-src-projects@freebsd.org Sun Oct 22 07:12:56 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 F1750E4B2CF for ; Sun, 22 Oct 2017 07:12:56 +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 CD779802A9; Sun, 22 Oct 2017 07:12:56 +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 v9M7CtH5010373; Sun, 22 Oct 2017 07:12:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9M7Ct31010370; Sun, 22 Oct 2017 07:12:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710220712.v9M7Ct31010370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 22 Oct 2017 07:12:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324847 - 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: 324847 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: Sun, 22 Oct 2017 07:12:57 -0000 Author: ngie Date: Sun Oct 22 07:12:55 2017 New Revision: 324847 URL: https://svnweb.freebsd.org/changeset/base/324847 Log: It _was_ .gcno's, not .gcda's that get produced with cc --coverage Try to install them instead of the .gcda's, since the .gcda's likely won't exist. TODO: verify that installworld does indeed do the right thing. Ref: gcc(1) -ftest-coverage description; --coverage (option in use) is an alias for -fprofile-arcs -ftest-coverage Modified: projects/runtime-coverage/share/mk/bsd.cov.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -2,9 +2,9 @@ # # Snippet for dealing with runtime coverage logic. # -# .gcda files are generated from files that are compiled from source, e.g., -# foo.gcda is foo.c or foo.cpp's file. In order for the libraries and programs -# to be properly instrumented, the .gcda files must be installed to a prefix +# .gcno files are generated from files that are compiled from source, e.g., +# foo.gcno is foo.c or foo.cpp's file. In order for the libraries and programs +# to be properly instrumented, the .gcno files must be installed to a prefix # common to the object files. # # See gcov(1) for more details. @@ -13,12 +13,12 @@ FILESGROUPS?= FILES -.if !empty(GCDAS) -GCDAS:= ${GCDAS:O:u} -FILESGROUPS+= GCDAS -CLEANFILES+= ${GCDAS} +.if !empty(GCNOS) +GCNOS:= ${GCNOS:O:u} +FILESGROUPS+= GCNOS +CLEANFILES+= ${GCNOS} -.for _gcda in ${GCDAS} -GCDASDIR_${_gcda:T}= ${COVERAGEDIR}${_gcda:H:tA} +.for _gcno in ${GCNOS} +GCNOSDIR_${_gcno:T}= ${COVERAGEDIR}${_gcno:H:tA} .endfor .endif Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -459,11 +459,11 @@ _libinstall: .if !defined(LIBRARIES_ONLY) .include .if defined(_COV_FLAG) -_GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} -.undef _GCDA_SRCS -.for _gcda in ${GCDAS} -${_gcda}: ${_gcda:R}.pico +_GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} +GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g} +.undef _GCNO_SRCS +.for _gcno in ${GCNOS} +${_gcno}: ${_gcno:R}.pico .endfor .include .endif Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 03:52:26 2017 (r324846) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 07:12:55 2017 (r324847) @@ -307,10 +307,10 @@ NLSNAME?= ${PROG} .include .if defined(_COV_FLAG) _GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} -GCDAS:= ${_GCDA_SRCS:R:S/$/.gcda/g} +GCDAS:= ${_GCDA_SRCS:R:S/$/.gcno/g} .undef _GCDA_SRCS -.for _gcda in ${GCDAS} -${_gcda}: ${_gcda:R}.pico +.for _gcno in ${GCDAS} +${_gcno}: ${_gcno:R}.pico .endfor .include .endif