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).
This commit is contained in:
parent
4263479d3e
commit
28b8cff301
|
@ -47,7 +47,7 @@ in
|
||||||
buildkite-agents = handleTest ./buildkite-agents.nix {};
|
buildkite-agents = handleTest ./buildkite-agents.nix {};
|
||||||
caddy = handleTest ./caddy.nix {};
|
caddy = handleTest ./caddy.nix {};
|
||||||
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
|
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
|
||||||
cage = handleTest ./cage.nix {};
|
cage = handleTestOn ["x86_64-linux"] ./cage.nix {};
|
||||||
cagebreak = handleTest ./cagebreak.nix {};
|
cagebreak = handleTest ./cagebreak.nix {};
|
||||||
calibre-web = handleTest ./calibre-web.nix {};
|
calibre-web = handleTest ./calibre-web.nix {};
|
||||||
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
|
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
|
||||||
|
|
|
@ -25,6 +25,11 @@ import ./make-test-python.nix ({ pkgs, ...} :
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
user = nodes.machine.config.users.users.alice;
|
user = nodes.machine.config.users.users.alice;
|
||||||
in ''
|
in ''
|
||||||
|
# Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):
|
||||||
|
# machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]
|
||||||
|
# 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
|
||||||
|
os.environ["QEMU_OPTS"] = "-vga virtio"
|
||||||
|
|
||||||
with subtest("Wait for cage to boot up"):
|
with subtest("Wait for cage to boot up"):
|
||||||
start_all()
|
start_all()
|
||||||
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")
|
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")
|
||||||
|
|
Loading…
Reference in a new issue