luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 15:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/3v1n0/macos-add-desktop-app-info' into 'main'

Browse Source 
appmonitor: Skip the test under OSX

See merge request GNOME/glib!3388
This commit is contained in:
Emmanuele Bassi
2023-04-20 16:52:45 +00:00
parent 9f3c4ec940 d296e94559
commit b8466bb54d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gio/tests/appmonitor.c
View File

@@ -22,7 +22,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <gstdio.h> #include <gstdio.h>
#ifdef G_OS_UNIX #if defined (G_OS_UNIX) && !defined (__APPLE__)
#include <gio/gdesktopappinfo.h> #include <gio/gdesktopappinfo.h>
#endif #endif
@@ -49,7 +49,7 @@ teardown (Fixture *fixture,
g_clear_pointer (&fixture->applications_dir, g_free); g_clear_pointer (&fixture->applications_dir, g_free);
} }
#ifdef G_OS_UNIX #if defined (G_OS_UNIX) && !defined (__APPLE__)
static gboolean static gboolean
create_app (gpointer data) create_app (gpointer data)
{ {
@@ -97,13 +97,13 @@ timeout_cb (gpointer user_data)
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
#endif /* G_OS_UNIX */ #endif /* defined (G_OS_UNIX) && !defined (__APPLE__) */
static void static void
test_app_monitor (Fixture *fixture, test_app_monitor (Fixture *fixture,
gconstpointer user_data) gconstpointer user_data)
{ {
#ifdef G_OS_UNIX #if defined (G_OS_UNIX) && !defined (__APPLE__)
gchar *app_path; gchar *app_path;
GAppInfoMonitor *monitor; GAppInfoMonitor *monitor;
GMainContext *context = NULL; /* use the global default main context */ GMainContext *context = NULL; /* use the global default main context */
@@ -162,9 +162,11 @@ test_app_monitor (Fixture *fixture,
g_object_unref (monitor); g_object_unref (monitor);
g_free (app_path); g_free (app_path);
#else /* if !G_OS_UNIX */ #elif defined (__APPLE__)
g_test_skip (".desktop monitor on macos");
#else /* if !(defined (G_OS_UNIX) && !defined (__APPLE__)) */
g_test_skip (".desktop monitor on win32"); g_test_skip (".desktop monitor on win32");
#endif /* !G_OS_UNIX */ #endif /* !(defined (G_OS_UNIX) && !defined (__APPLE__)) */
} }
int int