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

* Fix the Subversion test.

Browse Source 
svn path=/nixos/trunk/; revision=19191
This commit is contained in:
Eelco Dolstra 2010-01-03 17:57:38 +00:00
parent 790368e315
commit 73c5a61a68
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/subversion.nix
View File

@ -10,9 +10,10 @@ let
# Build some packages with coverage instrumentation. # Build some packages with coverage instrumentation.
overrides = pkgs: overrides = pkgs:
with pkgs.stdenvAdapters;
let let
do = pkg: pkg.override (args: { do = pkg: pkg.override (args: {
stdenv = pkgs.addCoverageInstrumentation args.stdenv; stdenv = addCoverageInstrumentation args.stdenv;
}); });
in in
rec { rec {
@ -24,22 +25,9 @@ let
# To build the kernel with coverage instrumentation, we need a # To build the kernel with coverage instrumentation, we need a
# special patch to make coverage data available under /proc. # special patch to make coverage data available under /proc.
kernel_2_6_28 = pkgs.kernel_2_6_28.override (orig: { kernel = pkgs.kernel.override (orig: {
stdenv = pkgs.cleanupBuildTree (pkgs.keepBuildTree orig.stdenv); stdenv = cleanupBuildTree (keepBuildTree orig.stdenv);
kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton kernelPatches = orig.kernelPatches ++ pkgs.lib.singleton pkgs.kernelPatches.gcov_2_6_28;
{ name = "gcov";
patch = pkgs.fetchurl {
url = http://buildfarm.st.ewi.tudelft.nl/~eelco/dist/linux-2.6.28-gcov.patch;
sha256 = "0ck9misa3pgh3vzyb7714ibf7ix7piyg5dvfa9r42v15scjqiyny";
};
extraConfig =
''
CONFIG_GCOV_PROFILE=y
CONFIG_GCOV_ALL=y
CONFIG_GCOV_PROC=m
CONFIG_GCOV_HAMMER=n
'';
};
}); });
}; };