mirror of
https://github.com/ghostty-org/ghostty.git
synced 2026-05-28 07:45:20 +00:00
Adds a bell-leak-check-gnome NixOS test (nix/tests.nix) that launches Ghostty under GNOME on Wayland, rings 100 bells in the window, and fails if the GUI process thread count grows per-bell — the end-to-end signature of the GStreamer pipeline leak fixed in this branch. Verified locally: growth of ~1 thread over 100 bells, vs ~+400 pre-fix. Replaces the earlier Xvfb shell script + workflow job: per review, X11 support in GNOME is going away, and this belongs as a Nix check alongside the other *-gnome tests rather than a standalone script. The VM has no GPU, so it renders via llvmpipe; the test gives the guest enough cores/RAM for software GL and tolerates the +new-window D-Bus activation exceeding its client-side timeout (the window still comes up) by waiting for the window rather than hard-failing on the call. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
394 lines
12 KiB
Nix
394 lines
12 KiB
Nix
{
|
|
self,
|
|
system,
|
|
nixpkgs,
|
|
home-manager,
|
|
...
|
|
}: let
|
|
nixos-version = nixpkgs.lib.trivial.release;
|
|
|
|
pkgs = import nixpkgs {
|
|
inherit system;
|
|
overlays = [
|
|
self.overlays.debug
|
|
];
|
|
};
|
|
|
|
pink_value = "#FF0087";
|
|
|
|
color_test = ''
|
|
import tempfile
|
|
import subprocess
|
|
|
|
def check_for_pink(final=False) -> bool:
|
|
with tempfile.NamedTemporaryFile() as tmpin:
|
|
machine.send_monitor_command("screendump {}".format(tmpin.name))
|
|
|
|
cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format(
|
|
tmpin.name
|
|
)
|
|
ret = subprocess.run(cmd, shell=True, capture_output=True)
|
|
if ret.returncode != 0:
|
|
raise Exception(
|
|
"image analysis failed with exit code {}".format(ret.returncode)
|
|
)
|
|
|
|
text = ret.stdout.decode("utf-8")
|
|
return "${pink_value}" in text
|
|
'';
|
|
|
|
mkNodeGnome = {
|
|
config,
|
|
pkgs,
|
|
settings,
|
|
sshPort ? null,
|
|
...
|
|
}: {
|
|
imports = [
|
|
./vm/wayland-gnome.nix
|
|
settings
|
|
];
|
|
|
|
virtualisation = {
|
|
forwardPorts = pkgs.lib.optionals (sshPort != null) [
|
|
{
|
|
from = "host";
|
|
host.port = sshPort;
|
|
guest.port = 22;
|
|
}
|
|
];
|
|
|
|
vmVariant = {
|
|
virtualisation.host.pkgs = pkgs;
|
|
};
|
|
};
|
|
|
|
services.openssh = {
|
|
enable = true;
|
|
settings = {
|
|
PermitRootLogin = "yes";
|
|
PermitEmptyPasswords = "yes";
|
|
};
|
|
};
|
|
|
|
security.pam.services.sshd.allowNullPassword = true;
|
|
|
|
users.groups.ghostty = {
|
|
gid = 1000;
|
|
};
|
|
|
|
users.users.ghostty = {
|
|
uid = 1000;
|
|
};
|
|
|
|
home-manager = {
|
|
users = {
|
|
ghostty = {
|
|
home = {
|
|
username = config.users.users.ghostty.name;
|
|
homeDirectory = config.users.users.ghostty.home;
|
|
stateVersion = nixos-version;
|
|
};
|
|
programs.ssh = {
|
|
enable = true;
|
|
enableDefaultConfig = false;
|
|
extraOptionOverrides = {
|
|
StrictHostKeyChecking = "accept-new";
|
|
UserKnownHostsFile = "/dev/null";
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
system.stateVersion = nixos-version;
|
|
};
|
|
|
|
mkTestGnome = {
|
|
name,
|
|
settings,
|
|
testScript,
|
|
ocr ? false,
|
|
}:
|
|
pkgs.testers.runNixOSTest {
|
|
name = name;
|
|
|
|
enableOCR = ocr;
|
|
|
|
extraBaseModules = {
|
|
imports = [
|
|
home-manager.nixosModules.home-manager
|
|
];
|
|
};
|
|
|
|
nodes = {
|
|
machine = {
|
|
config,
|
|
pkgs,
|
|
...
|
|
}:
|
|
mkNodeGnome {
|
|
inherit config pkgs settings;
|
|
sshPort = 2222;
|
|
};
|
|
};
|
|
|
|
testScript = testScript;
|
|
};
|
|
in {
|
|
basic-version-check = pkgs.testers.runNixOSTest {
|
|
name = "basic-version-check";
|
|
nodes = {
|
|
machine = {pkgs, ...}: {
|
|
users.groups.ghostty = {};
|
|
users.users.ghostty = {
|
|
isNormalUser = true;
|
|
group = "ghostty";
|
|
extraGroups = ["wheel"];
|
|
hashedPassword = "";
|
|
packages = [
|
|
pkgs.ghostty
|
|
];
|
|
};
|
|
};
|
|
};
|
|
testScript = {...}: ''
|
|
machine.succeed("su - ghostty -c 'ghostty +version'")
|
|
'';
|
|
};
|
|
|
|
basic-window-check-gnome = mkTestGnome {
|
|
name = "basic-window-check-gnome";
|
|
settings = {
|
|
home-manager.users.ghostty = {
|
|
xdg.configFile = {
|
|
"ghostty/config".text = ''
|
|
background = ${pink_value}
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
ocr = true;
|
|
testScript = {nodes, ...}: let
|
|
user = nodes.machine.users.users.ghostty;
|
|
bus_path = "/run/user/${toString user.uid}/bus";
|
|
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=${bus_path}";
|
|
gdbus = "${bus} gdbus";
|
|
ghostty = "${bus} ghostty";
|
|
su = command: "su - ${user.name} -c '${command}'";
|
|
gseval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";
|
|
wm_class = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
|
|
in ''
|
|
${color_test}
|
|
|
|
with subtest("wait for x"):
|
|
start_all()
|
|
machine.wait_for_x()
|
|
|
|
machine.wait_for_file("${bus_path}")
|
|
|
|
with subtest("Ensuring no pink is present without the terminal."):
|
|
assert (
|
|
check_for_pink() == False
|
|
), "Pink was present on the screen before we even launched a terminal!"
|
|
|
|
machine.systemctl("enable app-com.mitchellh.ghostty-debug.service", user="${user.name}")
|
|
machine.succeed("${su "${ghostty} +new-window"}")
|
|
machine.wait_until_succeeds("${wm_class} | grep -q 'com.mitchellh.ghostty-debug'")
|
|
|
|
machine.sleep(2)
|
|
|
|
with subtest("Have the terminal display a color."):
|
|
assert(
|
|
check_for_pink() == True
|
|
), "Pink was not found on the screen!"
|
|
|
|
machine.systemctl("stop app-com.mitchellh.ghostty-debug.service", user="${user.name}")
|
|
'';
|
|
};
|
|
|
|
ssh-integration-test = pkgs.testers.runNixOSTest {
|
|
name = "ssh-integration-test";
|
|
extraBaseModules = {
|
|
imports = [
|
|
home-manager.nixosModules.home-manager
|
|
];
|
|
};
|
|
nodes = {
|
|
server = {...}: {
|
|
users.groups.ghostty = {};
|
|
users.users.ghostty = {
|
|
isNormalUser = true;
|
|
group = "ghostty";
|
|
extraGroups = ["wheel"];
|
|
hashedPassword = "";
|
|
packages = [];
|
|
};
|
|
services.openssh = {
|
|
enable = true;
|
|
settings = {
|
|
PermitRootLogin = "yes";
|
|
PermitEmptyPasswords = "yes";
|
|
};
|
|
};
|
|
security.pam.services.sshd.allowNullPassword = true;
|
|
};
|
|
client = {
|
|
config,
|
|
pkgs,
|
|
...
|
|
}:
|
|
mkNodeGnome {
|
|
inherit config pkgs;
|
|
settings = {
|
|
home-manager.users.ghostty = {
|
|
xdg.configFile = {
|
|
"ghostty/config".text = let
|
|
in ''
|
|
shell-integration-features = ssh-terminfo
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
sshPort = 2222;
|
|
};
|
|
};
|
|
testScript = {nodes, ...}: let
|
|
user = nodes.client.users.users.ghostty;
|
|
bus_path = "/run/user/${toString user.uid}/bus";
|
|
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=${bus_path}";
|
|
gdbus = "${bus} gdbus";
|
|
ghostty = "${bus} ghostty";
|
|
su = command: "su - ${user.name} -c '${command}'";
|
|
gseval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";
|
|
wm_class = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
|
|
in ''
|
|
with subtest("Start server and wait for ssh to be ready."):
|
|
server.start()
|
|
server.wait_for_open_port(22)
|
|
|
|
with subtest("Start client and wait for ghostty window."):
|
|
client.start()
|
|
client.wait_for_x()
|
|
client.wait_for_file("${bus_path}")
|
|
client.systemctl("enable app-com.mitchellh.ghostty-debug.service", user="${user.name}")
|
|
client.succeed("${su "${ghostty} +new-window"}")
|
|
client.wait_until_succeeds("${wm_class} | grep -q 'com.mitchellh.ghostty-debug'")
|
|
|
|
with subtest("SSH from client to server and verify that the Ghostty terminfo is copied."):
|
|
client.sleep(2)
|
|
client.send_chars("ssh ghostty@server\n")
|
|
server.wait_for_file("${user.home}/.terminfo/x/xterm-ghostty", timeout=30)
|
|
'';
|
|
};
|
|
|
|
# Regression test for the GTK audio-bell GStreamer thread leak. Each audio
|
|
# bell used to allocate a fresh gtk.MediaFile (and thus a GStreamer pipeline
|
|
# whose GL sink spawns gstglcontext/gldisplay-event threads that are never
|
|
# joined), leaking ~4 threads per ring; the fix reuses one MediaFile per
|
|
# surface. This rings many bells and asserts the GUI process thread count
|
|
# stays bounded. Runs under GNOME on Wayland so it exercises the real path.
|
|
bell-leak-check-gnome = mkTestGnome {
|
|
name = "bell-leak-check-gnome";
|
|
settings = {
|
|
# The VM has no GPU, so GNOME and Ghostty render via llvmpipe. Give the
|
|
# guest enough cores/RAM that software GL can bring up Ghostty's window
|
|
# before the +new-window D-Bus activation times out, and force clean
|
|
# software GL so mesa doesn't stall probing for absent hardware.
|
|
virtualisation.cores = 4;
|
|
virtualisation.memorySize = 4096;
|
|
environment.sessionVariables = {
|
|
LIBGL_ALWAYS_SOFTWARE = "1";
|
|
GALLIUM_DRIVER = "llvmpipe";
|
|
};
|
|
|
|
home-manager.users.ghostty = {
|
|
xdg.configFile = {
|
|
"ghostty/config".text = ''
|
|
bell-features = audio
|
|
bell-audio-path = ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/bell.oga
|
|
bell-audio-volume = 0
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
testScript = {nodes, ...}: let
|
|
user = nodes.machine.users.users.ghostty;
|
|
bus_path = "/run/user/${toString user.uid}/bus";
|
|
bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=${bus_path}";
|
|
gdbus = "${bus} gdbus";
|
|
ghostty = "${bus} ghostty";
|
|
su = command: "su - ${user.name} -c '${command}'";
|
|
gseval = "call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval";
|
|
wm_class = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
|
|
|
|
# Emits N BELs >100ms apart (which clears the bell rate-limit), then holds
|
|
# so the window (and its audio pipeline) stays alive while we sample. Run
|
|
# by typing its path into the open window; written as a script to avoid
|
|
# shell-escaping the BEL byte through the test driver.
|
|
ringBells = pkgs.writeShellScript "ring-bells" ''
|
|
for _ in $(seq 100); do printf '\a'; sleep 0.12; done
|
|
sleep 60
|
|
'';
|
|
in ''
|
|
# Thread count of the ghostty GUI process: the ghostty process with the
|
|
# most threads. The CLI also spawns 1-thread launcher/helper stubs (and
|
|
# this very command matches the pgrep), but those are filtered by the max.
|
|
def ghostty_threads():
|
|
out = machine.succeed(
|
|
"max=0; "
|
|
"for p in $(pgrep -f ghostty); do "
|
|
" n=$(ls /proc/$p/task 2>/dev/null | wc -l); "
|
|
" [ \"$n\" -gt \"$max\" ] && max=$n; "
|
|
"done; "
|
|
"echo $max"
|
|
).strip()
|
|
return int(out)
|
|
|
|
def window_open():
|
|
status, _ = machine.execute("${wm_class} | grep -q 'com.mitchellh.ghostty-debug'")
|
|
return status == 0
|
|
|
|
with subtest("boot and open a keep-alive ghostty window"):
|
|
start_all()
|
|
machine.wait_for_x()
|
|
machine.wait_for_file("${bus_path}")
|
|
machine.systemctl("enable app-com.mitchellh.ghostty-debug.service", user="${user.name}")
|
|
|
|
# Under software GL the +new-window D-Bus activation can exceed its
|
|
# client-side timeout even though the window still comes up, so we
|
|
# tolerate a failed call and (re)nudge until the window appears.
|
|
for _ in range(6):
|
|
machine.execute("${su "${ghostty} +new-window"}")
|
|
if window_open():
|
|
break
|
|
machine.sleep(5)
|
|
assert window_open(), "ghostty window never appeared"
|
|
machine.sleep(2)
|
|
|
|
with subtest("ring 100 bells and assert the thread count stays bounded"):
|
|
baseline = ghostty_threads()
|
|
|
|
# Ring the bells by running the script inside the focused window (type
|
|
# its path + Enter). A separate `ghostty -e` process can't open the
|
|
# display from the bare su environment, so we drive the open window.
|
|
machine.send_chars("${ringBells}\n")
|
|
|
|
# 100 bells * 0.12s + settle, within the script's trailing hold so the
|
|
# window (and its audio pipeline) is still alive when we sample.
|
|
machine.sleep(22)
|
|
final = ghostty_threads()
|
|
|
|
growth = final - baseline
|
|
print(f"bell-leak: baseline={baseline} final={final} growth={growth}")
|
|
|
|
# Pre-fix grows ~4 threads/bell (~+400 over 100 bells); the fix adds
|
|
# only one pipeline's worth of threads. 40 sits well clear of both.
|
|
assert growth <= 40, (
|
|
f"thread count grew by {growth} over 100 bells "
|
|
f"(baseline={baseline}, final={final}): audio-bell pipeline leak regressed"
|
|
)
|
|
'';
|
|
};
|
|
}
|