mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

* Coverage report: propagate the build products of the VM test run.

Browse source 
* Run the Quake 3 with coverage instrumentation.

svn path=/nixos/trunk/; revision=25480
This commit is contained in:
Eelco Dolstra 2011-01-09 22:21:22 +00:00
parent d0108cd951
commit ef82cd9c48
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/testing.nix
View file

@ -49,7 +49,7 @@ rec {
buildCommand =
''
ensureDir $out/nix-support
mkdir -p $out/nix-support
LOGFILE=$out/log.xml ${testDriver}/bin/nixos-test-driver ${network}/vms/*/bin/run-*-vm || failed=1
@ -64,7 +64,7 @@ rec {
echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products
for i in */coverage-data; do
ensureDir $out/coverage-data
mkdir -p $out/coverage-data
mv $i $out/coverage-data/$(dirname $i)
done
@ -107,12 +107,14 @@ rec {
done
echo "making report..."
ensureDir $out/coverage
mkdir -p $out/coverage
${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage
cp $TMPDIR/full.info $out/coverage/
ensureDir $out/nix-support
mkdir -p $out/nix-support
cat ${x}/nix-support/hydra-build-products >> $out/nix-support/hydra-build-products
echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products
[ ! -e ${x}/nix-support/failed ] || touch $out/nix-support/failed
''; # */

2
release.nix
View file

@ -173,7 +173,7 @@ let
nfs = t.nfs.test;
openssh = t.openssh.test;
proxy = t.proxy.test;
quake3 = t.quake3.test;
quake3 = t.quake3.report;
remote_builds = t.remote_builds.test;
subversion = t.subversion.report;
trac = t.trac.test;

14
tests/quake3.nix
View file

@ -1,5 +1,17 @@
{ pkgs, ... }:
let
# Build Quake with coverage instrumentation.
overrides = pkgs:
rec {
quake3game = pkgs.quake3game.override (args: {
stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
});
};
in
rec {
client =
@ -9,6 +21,7 @@ rec {
services.xserver.driSupport = true;
services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16;
environment.systemPackages = [ pkgs.quake3demo ];
nixpkgs.config.packageOverrides = overrides;
};
nodes =
@ -22,6 +35,7 @@ rec {
"${pkgs.quake3demo}/bin/quake3 '+set dedicated 1' '+set g_gametype 0' " +
"'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
};
nixpkgs.config.packageOverrides = overrides;
};
client1 = client;