diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-05-27 20:37:24 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-05-27 21:29:54 +0200 |
commit | 2f671ccc7a4bd8ffda8a63e7e188d246238dba64 (patch) | |
tree | 5ab6325a2e45afe99098f6fbd3f020c78003cb7b /nixos/tests/all-tests.nix | |
parent | f9b26b91a44df64e8e6c03ed2236c7f7b6a56d35 (diff) | |
download | nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.gz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.bz2 nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.lz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.xz nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.tar.zst nixpkgs-2f671ccc7a4bd8ffda8a63e7e188d246238dba64.zip |
nixos/tests/{sway,cage,cagebreak}: Fix the tests on aarch64-linux
Since the update to wlroots 0.13 (e03dde82a74) the default VGA card isn't supported anymore and we needed to switch to virtio (qxl didn't work either). However, as it turned out "-vga virtio" (28b8cff301f) broke the test on AArch64. Luckily there's a third option that works on all three supported platforms: virtio-gpu-pci According to [0] "This device lacks VGA compatibility mode but is otherwise identical to the virtio vga device. UEFI firmware can handle this, and if your guests has drivers too you can use this instead of virtio-vga. This will reduce the attack surface (no complex VGA emulation support) and reduce the memory footprint by 8 MB (no pci memory bar for VGA compatibility). This device can be placed in a PCI Express slot." So in the end this seems like the ideal choice :) See also [1]. [0]: https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/#virtio-gpu-pci [1]: https://patches.openembedded.org/patch/164351/
Diffstat (limited to 'nixos/tests/all-tests.nix')
-rw-r--r-- | nixos/tests/all-tests.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ed0dc0b8e6d..ab24c2c857a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -52,8 +52,8 @@ in buildkite-agents = handleTest ./buildkite-agents.nix {}; caddy = handleTest ./caddy.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; - cage = handleTestOn ["x86_64-linux"] ./cage.nix {}; - cagebreak = handleTestOn ["x86_64-linux"] ./cagebreak.nix {}; + cage = handleTest ./cage.nix {}; + cagebreak = handleTest ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; @@ -395,7 +395,7 @@ in sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; - sway = handleTestOn ["x86_64-linux"] ./sway.nix {}; + sway = handleTest ./sway.nix {}; switchTest = handleTest ./switch-test.nix {}; sympa = handleTest ./sympa.nix {}; syncthing = handleTest ./syncthing.nix {}; |