public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Always include "/nix/store/*" in lcovFilter.

Browse Source 
svn path=/nixpkgs/trunk/; revision=13583
This commit is contained in:
Eelco Dolstra 2008-12-04 15:32:30 +00:00
parent f679021d11
commit 2b2bb11f32
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/release/default.nix
View File

@ -11,7 +11,6 @@ rec {
nixBuild = args: import ./nix-build.nix ( nixBuild = args: import ./nix-build.nix (
{ inherit stdenv; { inherit stdenv;
doCoverageAnalysis = false;
} // args); } // args);
coverageAnalysis = args: nixBuild ( coverageAnalysis = args: nixBuild (

2
pkgs/build-support/release/make-source-tarball.nix
View File

@ -5,7 +5,7 @@
{ officialRelease ? false { officialRelease ? false
, buildInputs ? [] , buildInputs ? []
, src, stdenv, autoconf, automake, libtool , src, stdenv, autoconf, automake, libtool
, ...} @ args: , ... } @ args:
let let

10
pkgs/build-support/release/nix-build.nix
View File

@ -5,7 +5,10 @@
# it turns on GCC's coverage analysis feature. It then runs `make # it turns on GCC's coverage analysis feature. It then runs `make
# check' and produces a coverage analysis report using `lcov'. # check' and produces a coverage analysis report using `lcov'.
args: with args; { doCoverageAnalysis ? false
, lcovFilter ? []
, src, stdenv
, ... } @ args:
stdenv.mkDerivation ( stdenv.mkDerivation (
@ -20,8 +23,6 @@ stdenv.mkDerivation (
showBuildStats = true; showBuildStats = true;
lcovFilter = ["/nix/store/*"];
# Hack - swap checkPhase and installPhase (otherwise Stratego barfs). # Hack - swap checkPhase and installPhase (otherwise Stratego barfs).
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""}"; phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase ${if doCoverageAnalysis then "coverageReportPhase" else ""}";
} }
@ -83,6 +84,9 @@ stdenv.mkDerivation (
'' else ""; '' else "";
lcovFilter = ["/nix/store/*"] ++ lcovFilter;
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}";
}; };