diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-06-25 10:02:10 +0200 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-06-25 10:02:10 +0200 |
| commit | c1dca92daf8de1a7421d412f2fa68fab16a0289a (patch) | |
| tree | ab8668d289e2b8393c0540720618cfb3e50eca95 /nixos/tests | |
| parent | d437a6cac2086ead6232bc4d84c25c58a33c1b59 (diff) | |
| parent | 5555f34784ef4013e207097f9da8f2861eb5b9e3 (diff) | |
| download | nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.gz nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.bz2 nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.lz nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.xz nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.tar.zst nixlib-c1dca92daf8de1a7421d412f2fa68fab16a0289a.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/sway.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 0985e0b4308b..21900ee4c014 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -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") ''; }) |