mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-02 21:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix desktop detection tests when running from Gnome

Browse Source 
Environment variables from the "real" environment leaked into the test
after the Zig 0.16 update which would cause them to fail if you ran them
on a Gnome system.
This commit is contained in:
Jeffrey C. Ollie
2026-07-23 14:47:06 -05:00
parent 15484b607e
commit f8e13f31e6
1 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/os/desktop.zig
View File

@@ -114,32 +114,55 @@ pub fn desktopEnvironment(environ_map: *const std.process.Environ.Map) DesktopEn
test "desktop environment" {
const testing = std.testing;
// Always run these tests with a blank evironment map so that we don't get any
// failures from values in the "real" evironment leaking in.
switch (builtin.os.tag) {
inline .macos, .windows => |tag| {
var environ_map = try testing.environ.createMap(testing.allocator);
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try testing.expectEqual(@tagName(tag), @tagName(desktopEnvironment(&environ_map)));
},
.linux, .freebsd => {
var environ_map = try testing.environ.createMap(testing.allocator);
defer environ_map.deinit();
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try environ_map.put("XDG_SESSION_DESKTOP", "gnome");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
}
try environ_map.put("XDG_SESSION_DESKTOP", "gnome");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
try environ_map.put("XDG_SESSION_DESKTOP", "gnome-xorg");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
try environ_map.put("XDG_SESSION_DESKTOP", "foobar");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try environ_map.put("XDG_SESSION_DESKTOP", "gnome-xorg");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
}
_ = environ_map.orderedRemove("XDG_SESSION_DESKTOP");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try environ_map.put("XDG_SESSION_DESKTOP", "foobar");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
}
try environ_map.put("XDG_CURRENT_DESKTOP", "GNOME");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
try environ_map.put("XDG_CURRENT_DESKTOP", "FOOBAR");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
_ = environ_map.orderedRemove("XDG_CURRENT_DESKTOP");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try environ_map.put("XDG_CURRENT_DESKTOP", "GNOME");
try testing.expectEqual(.gnome, desktopEnvironment(&environ_map));
}
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try environ_map.put("XDG_CURRENT_DESKTOP", "FOOBAR");
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
}
{
var environ_map: std.process.Environ.Map = .init(testing.allocator);
defer environ_map.deinit();
try testing.expectEqual(.other, desktopEnvironment(&environ_map));
}
},
else => try testing.expectEqual(.other, DesktopEnvironment()),
}