From 7a491b54fad97ac67648505eb3b1a3cd54cb13f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 12:22:44 +0000 Subject: [PATCH] releaseTools.coverageAnalysis: Add `lcovExtraTraceFiles' parameter. svn path=/nixpkgs/trunk/; revision=21743 --- pkgs/build-support/release/nix-build.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 385abe53140..d0acce96113 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -7,6 +7,7 @@ { doCoverageAnalysis ? false , lcovFilter ? [] +, lcovExtraTraceFiles ? [] , src, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , ... } @ args: @@ -73,8 +74,9 @@ stdenv.mkDerivation ( ${args.lcov}/bin/lcov --remove app.info $lcovFilter > app2.info set +o noglob mv app2.info app.info + mkdir $out/coverage - ${args.lcov}/bin/genhtml app.info -o $out/coverage > log + ${args.lcov}/bin/genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log # Grab the overall coverage percentage for use in release overviews. grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate @@ -85,6 +87,7 @@ stdenv.mkDerivation ( lcovFilter = ["/nix/store/*"] ++ lcovFilter; + inherit lcovExtraTraceFiles; meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";