diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-20 21:29:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 21:29:37 +0200 |
| commit | e40d850fd13cdb8daab7745bc15631e737c1b1a0 (patch) | |
| tree | b0dbb12666fecb0ed7ac93c096cee7b5588311f9 | |
| parent | 9114d13d000a7ecd977fc8c52a35842c8284c08e (diff) | |
| download | nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar.gz nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar.bz2 nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar.lz nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar.xz nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.tar.zst nixlib-e40d850fd13cdb8daab7745bc15631e737c1b1a0.zip | |
nixos/tests/gdk-pixbuf: fix test on i686 (#46916)
Test didn't run because it tried to create a VM with 4096M RAM but qemu-system-i386 has a hard 2047M memory limit. - reduce memory to 2047M on i686. - increase timeout 300s -> 1800s because the tests are much slower on i686 and timed out.
| -rw-r--r-- | nixos/tests/gdk-pixbuf.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix index b20f61b5ffe2..005c5111da2b 100644 --- a/nixos/tests/gdk-pixbuf.nix +++ b/nixos/tests/gdk-pixbuf.nix @@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: { environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ]; - virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE + # Tests allocate a lot of memory trying to exploit a CVE + # but qemu-system-i386 has a 2047M memory limit + virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; }; testScript = '' - $machine->succeed("gnome-desktop-testing-runner"); + $machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s ''; }) |