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

test-driver: Use netpbm instead of imagemagick

Browse Source 
Imagemagick pulls in 100s of megabytes of dependencies.
This commit is contained in:
Eelco Dolstra 2014-09-24 23:48:31 +02:00
parent 08732891e1
commit 51c349d0cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/test-driver/Machine.pm
View File

@ -482,7 +482,7 @@ sub screenshot {
my $name = basename($filename); my $name = basename($filename);
$self->nest("making screenshot ‘$name’", sub { $self->nest("making screenshot ‘$name’", sub {
$self->sendMonitorCommand("screendump $tmp"); $self->sendMonitorCommand("screendump $tmp");
system("convert $tmp ${filename}") == 0 system("pnmtopng $tmp > ${filename}") == 0
or die "cannot convert screenshot"; or die "cannot convert screenshot";
unlink $tmp; unlink $tmp;
}, { image => $name } ); }, { image => $name } );

6
nixos/lib/testing.nix
View File

@ -27,7 +27,7 @@ rec {
cp ${./test-driver/Logger.pm} $libDir/Logger.pm cp ${./test-driver/Logger.pm} $libDir/Logger.pm
wrapProgram $out/bin/nixos-test-driver \ 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" --prefix PERL5LIB : "${lib.makePerlPath [ perlPackages.TermReadLineGnu perlPackages.XMLWriter perlPackages.IOTty ]}:$out/lib/perl5/site_perl"
''; '';
}; };
@ -41,7 +41,7 @@ rec {
requiredSystemFeatures = [ "kvm" "nixos-test" ]; requiredSystemFeatures = [ "kvm" "nixos-test" ];
buildInputs = [ pkgs.libxslt ]; buildInputs = [ libxslt ];
buildCommand = buildCommand =
'' ''
@ -153,7 +153,7 @@ rec {
startAll; startAll;
$client->waitForUnit("multi-user.target"); $client->waitForUnit("multi-user.target");
${preBuild} ${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} ${postBuild}
$client->succeed("sync"); # flush all data before pulling the plug $client->succeed("sync"); # flush all data before pulling the plug
''; '';