public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121698 from primeos/nixos-tests-support-wayland-only-setups

Browse Source 
nixos/test-driver: Allow interactive testing on Wayland-only setups
This commit is contained in:
Jacek Galowicz 2021-05-04 17:45:43 +02:00 committed by GitHub
commit c25f87eb5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/lib/test-driver/test-driver.py
View File

@ -735,6 +735,7 @@ class Machine:
shell_path = os.path.join(self.state_dir, "shell") shell_path = os.path.join(self.state_dir, "shell")
self.shell_socket = create_socket(shell_path) self.shell_socket = create_socket(shell_path)
display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])
qemu_options = ( qemu_options = (
" ".join( " ".join(
[ [
@ -744,7 +745,7 @@ class Machine:
"-device virtio-serial", "-device virtio-serial",
"-device virtconsole,chardev=shell", "-device virtconsole,chardev=shell",
"-device virtio-rng-pci", "-device virtio-rng-pci",
"-serial stdio" if "DISPLAY" in os.environ else "-nographic", "-serial stdio" if display_available else "-nographic",
] ]
) )
+ " " + " "