From 482beabbbde032c18daf5039bd9739db25a7ea93 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Thu, 20 Mar 2025 15:36:33 +0000 Subject: [PATCH] NixOS Test driver: Display Qemu windows on macOS in interactive mode --- nixos/lib/test-driver/src/test_driver/machine.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/lib/test-driver/src/test_driver/machine.py b/nixos/lib/test-driver/src/test_driver/machine.py index 4faa37726508..cba386ae86b4 100644 --- a/nixos/lib/test-driver/src/test_driver/machine.py +++ b/nixos/lib/test-driver/src/test_driver/machine.py @@ -1,6 +1,7 @@ import base64 import io import os +import platform import queue import re import select @@ -199,7 +200,13 @@ class StartCommand: allow_reboot: bool = False, ) -> str: display_opts = "" + display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"]) + if platform.system() == "Darwin": + # We have no DISPLAY variables on macOS and seemingly no better way + # to find out + display_available = "TERM_PROGRAM" in os.environ + if not display_available: display_opts += " -nographic"