git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/tests/cage: Fix the test with wlroots 0.13

See #119615 for more details. The aarch64-linux test failed with "qemu-system-aarch64: Virtio VGA not available" so I've restricted the test to x86_64-linux (the virtio paravirtualized 3D graphics driver is likely only available on very few platforms).

commit28b8cff301f356a7a24be1b6203f6a2e3a814e7d authorMichael Weiss <dev.primeos@gmail.com> dateFri 30 Apr 2021, 15:34 (6 years ago) parent4263479
2 files changed+6−1
nixos/tests/all-tests.nix+1−1 nixos/tests/cage.nix+5
nixos/tests/all-tests.nix+1−1
@@ -47,7 +47,7 @@ in
4747 buildkite-agents = handleTest ./buildkite-agents.nix {};
4848 caddy = handleTest ./caddy.nix {};
4949 cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
50− cage = handleTest ./cage.nix {};
50+ cage = handleTestOn ["x86_64-linux"] ./cage.nix {};
5151 cagebreak = handleTest ./cagebreak.nix {};
5252 calibre-web = handleTest ./calibre-web.nix {};
5353 cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
nixos/tests/cage.nix+5
@@ -25,6 +25,11 @@ import ./make-test-python.nix ({ pkgs, ...} :
2525 testScript = { nodes, ... }: let
2626 user = nodes.machine.config.users.users.alice;
2727 in ''
28+ # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):
29+ # machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]
30+ # machine # [ 14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7
31+ os.environ["QEMU_OPTS"] = "-vga virtio"
32+
2833 with subtest("Wait for cage to boot up"):
2934 start_all()
3035 machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")