movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge branch 'master' into staging-next

Browse source
This commit is contained in:
Robert Schütz 2021-06-25 10:02:10 +02:00
commit c1dca92daf
106 changed files with 9008 additions and 6633 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/tests/sway.nix
View file

@ -15,7 +15,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
# For glinfo and wayland-info:
systemPackages = with pkgs; [ mesa-demos wayland-utils ];
# Use a fixed SWAYSOCK path (for swaymsg):
variables."SWAYSOCK" = "/tmp/sway-ipc.sock";
variables = {
"SWAYSOCK" = "/tmp/sway-ipc.sock";
"WLR_RENDERER_ALLOW_SOFTWARE" = "1";
};
# For convenience:
shellAliases = {
test-x11 = "glinfo | head -n 3 | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
@ -101,6 +104,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
# Exit Sway and verify process exit status 0:
machine.succeed("su - alice -c 'swaymsg exit || true'")
machine.wait_for_file("/tmp/sway-exit-ok")
# TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test:
# machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000]
# machine.wait_for_file("/tmp/sway-exit-ok")
'';
})