From 05cb34c6d0fde621f5d55be5ef6fe67bbd860ca4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Sep 2009 19:59:26 +0000 Subject: [PATCH] svn path=/nixos/trunk/; revision=16942 --- lib/build-vms.nix | 9 +++++++++ release.nix | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/lib/build-vms.nix b/lib/build-vms.nix index 97c9a040c63..071c458a944 100644 --- a/lib/build-vms.nix +++ b/lib/build-vms.nix @@ -130,11 +130,20 @@ rec { '' mkdir $out cp ${./test-driver/Machine.pm} Machine.pm + ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm + for i in */coverage-data; do ensureDir $out/coverage-data mv $i $out/coverage-data/$(dirname $i) done + + for i in $out/*.xwd; do + j=$out/$(basename $i .xwd).png + ${pkgs.imagemagick}/bin/convert $i $j + ensureDir $out/nix-support + echo "report screenshot $j" >> $out/nix-support/hydra-build-products + done ''; # */ }; diff --git a/release.nix b/release.nix index 4dbf798ec0c..be7cede3f85 100644 --- a/release.nix +++ b/release.nix @@ -106,6 +106,13 @@ let system = "i686-linux"; }).report; + tests.kde4 = + { services ? ../services }: + + (import ./tests/kde4.nix { + inherit nixpkgs services; + system = "i686-linux"; + }).test; };