diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-03 13:39:30 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-03-03 13:57:08 +0100 |
commit | 497997cc388ce791ca0b4dc55f46ab515e8fb5d9 (patch) | |
tree | 867053bb31858180d2b439d1c63c610c58be54ee /nixos/tests | |
parent | ad7c518e45221533e2094acb20fea6ade477da75 (diff) | |
download | nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar.gz nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar.bz2 nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar.lz nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar.xz nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.tar.zst nixpkgs-497997cc388ce791ca0b4dc55f46ab515e8fb5d9.zip |
Move generation of coverage reports from nixos/lib/testing to releaseTools
Also, turn some stdenv adapters into setup hooks.
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/quake3.nix | 4 | ||||
-rw-r--r-- | nixos/tests/subversion.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 92501107780..fefbd75b4a3 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -14,11 +14,13 @@ in rec { + makeCoverageReport = true; + client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.driSupport = true; + hardware.opengl.driSupport = true; services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index 309da90c5df..49450c78f3b 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -20,7 +20,7 @@ let # To build the kernel with coverage instrumentation, we need a # special patch to make coverage data available under /proc. linux = pkgs.linux.override (orig: { - stdenv = cleanupBuildTree (keepBuildTree orig.stdenv); + stdenv = overrideInStdenv pkgs.stdenv [ pkgs.keepBuildTree ]; extraConfig = '' GCOV_KERNEL y |