diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-24 23:48:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-25 00:07:30 +0200 |
| commit | 51c349d0cc39fa8f692386e3f6d25653a91e17db (patch) | |
| tree | 10cb3b1808cbb1c158118e6339594543e08c3852 /nixos | |
| parent | 08732891e1f4de4d03e103ec588da4c010f07370 (diff) | |
| download | nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar.gz nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar.bz2 nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar.lz nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar.xz nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.tar.zst nixpkgs-51c349d0cc39fa8f692386e3f6d25653a91e17db.zip | |
test-driver: Use netpbm instead of imagemagick
Imagemagick pulls in 100s of megabytes of dependencies.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/test-driver/Machine.pm | 2 | ||||
| -rw-r--r-- | nixos/lib/testing.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index e2bd3393d87..85c2bfa88e1 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -482,7 +482,7 @@ sub screenshot { my $name = basename($filename); $self->nest("making screenshot ‘$name’", sub { $self->sendMonitorCommand("screendump $tmp"); - system("convert $tmp ${filename}") == 0 + system("pnmtopng $tmp > ${filename}") == 0 or die "cannot convert screenshot"; unlink $tmp; }, { image => $name } ); diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 75e9c397776..73b55ed6c06 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -27,7 +27,7 @@ rec { cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${pkgs.qemu_kvm}/bin:${pkgs.vde2}/bin:${imagemagick}/bin:${coreutils}/bin" \ + --prefix PATH : "${qemu_kvm}/bin:${vde2}/bin:${netpbm}/bin:${coreutils}/bin" \ --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl" ''; }; @@ -41,7 +41,7 @@ rec { requiredSystemFeatures = [ "kvm" "nixos-test" ]; - buildInputs = [ pkgs.libxslt ]; + buildInputs = [ libxslt ]; buildCommand = '' @@ -153,7 +153,7 @@ rec { startAll; $client->waitForUnit("multi-user.target"); ${preBuild} - $client->succeed("env -i ${pkgs.bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); + $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); ${postBuild} $client->succeed("sync"); # flush all data before pulling the plug ''; |