From 6ea3ce88c3437cb530504bf26f6a35c420923fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Barnab=C3=A1=20Silva?= Date: Wed, 5 Nov 2025 21:30:18 -0300 Subject: [PATCH] tests: consider macOS behaviour in g_getenv tests This change adds the macOS behaviour to assertions when testing g_getenv with `=` in key names. environment tests for Darwin were also re-enabled --- glib/tests/environment.c | 8 ++++++-- glib/tests/meson.build | 5 +---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/glib/tests/environment.c b/glib/tests/environment.c index 115237a4c..aec95bfa9 100644 --- a/glib/tests/environment.c +++ b/glib/tests/environment.c @@ -127,10 +127,14 @@ test_getenv (void) g_assert_true (g_setenv ("foo", "bar=baz", TRUE)); /* Different OSs return different values; some return NULL because the key - * is invalid, but some are happy to return what we set above. */ + * is invalid, but some are happy to return what we set above. macOS clips + * the key when it contains `=` */ data = g_getenv ("foo=bar"); if (data != NULL) - g_assert_cmpstr (data, ==, "baz"); + { + g_assert_true (g_strcmp0 (data, "bar=baz") == 0 || + g_strcmp0 (data, "baz") == 0); + } else { data = g_getenv ("foo"); diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 564497c90..c4fec0c13 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -33,10 +33,7 @@ glib_tests = { 'can_fail' : host_system == 'darwin' or linux_libc == 'musl', }, 'dir' : {}, - 'environment' : { - # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 - 'can_fail' : host_system == 'darwin', - }, + 'environment' : {}, 'error' : {}, 'fileutils' : {}, 'gdatetime' : {