luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-23 18:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'getenv-invalid-names' into 'main'

Browse Source 
genvironment: consider macOS behavior when testing g_getenv

See merge request GNOME/glib!4899
This commit is contained in:
Philip Withnall
2025-11-09 18:22:32 +00:00
parent c44555d2a4 6ea3ce88c3
commit 91524a98c5
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glib/tests/environment.c
View File

@@ -127,10 +127,14 @@ test_getenv (void)
g_assert_true (g_setenv ("foo", "bar=baz", TRUE)); g_assert_true (g_setenv ("foo", "bar=baz", TRUE));
/* Different OSs return different values; some return NULL because the key /* 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"); data = g_getenv ("foo=bar");
if (data != NULL) if (data != NULL)
g_assert_cmpstr (data, ==, "baz"); {
g_assert_true (g_strcmp0 (data, "bar=baz") == 0 ||
g_strcmp0 (data, "baz") == 0);
}
else else
{ {
data = g_getenv ("foo"); data = g_getenv ("foo");

5
glib/tests/meson.build
View File

@@ -33,10 +33,7 @@ glib_tests = {
'can_fail' : host_system == 'darwin' or linux_libc == 'musl', 'can_fail' : host_system == 'darwin' or linux_libc == 'musl',
}, },
'dir' : {}, 'dir' : {},
'environment' : { 'environment' : {},
# FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
'can_fail' : host_system == 'darwin',
},
'error' : {}, 'error' : {},
'fileutils' : {}, 'fileutils' : {},
'gdatetime' : { 'gdatetime' : {