mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-21 16:38:54 +02:00
Merge branch 'wip/pwithnall/2781-desktop-app-info-proc-bsd' into 'main'
tests: Temporarily disable desktop-app-info terminal test on FreeBSD See merge request GNOME/glib!2972
This commit is contained in:
@@ -1182,6 +1182,7 @@ test_id (void)
|
|||||||
g_free (result);
|
g_free (result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(__FreeBSD__)
|
||||||
static const char *
|
static const char *
|
||||||
get_terminal_divider (const char *terminal_name)
|
get_terminal_divider (const char *terminal_name)
|
||||||
{
|
{
|
||||||
@@ -1208,10 +1209,15 @@ get_terminal_divider (const char *terminal_name)
|
|||||||
|
|
||||||
g_return_val_if_reached (NULL);
|
g_return_val_if_reached (NULL);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
test_launch_uris_with_terminal (gconstpointer data)
|
test_launch_uris_with_terminal (gconstpointer data)
|
||||||
{
|
{
|
||||||
|
#if defined(__FreeBSD__)
|
||||||
|
/* FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/2781 */
|
||||||
|
g_test_skip ("/proc pipe sharing currently doesn’t work reliably on FreeBSD CI");
|
||||||
|
#else
|
||||||
int fds[2];
|
int fds[2];
|
||||||
const char *terminal_exec = data;
|
const char *terminal_exec = data;
|
||||||
char *old_path;
|
char *old_path;
|
||||||
@@ -1337,6 +1343,7 @@ test_launch_uris_with_terminal (gconstpointer data)
|
|||||||
g_clear_error (&error);
|
g_clear_error (&error);
|
||||||
g_clear_list (&paths, NULL);
|
g_clear_list (&paths, NULL);
|
||||||
g_clear_list (&uris, g_free);
|
g_clear_list (&uris, g_free);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Reference in New Issue
Block a user