mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-21 17:56:18 +02:00
cc19922183
Create a function run_with_application that both ensures the app is running exactly while the test is running, which most of the tests use. We start it beforehand, and kill it after. This avoids having any interdependence between the tests (and there definitely was before, because we didn't wait for the process to actually terminate after a kill() call). Also, open a pipe between the two, and have the child app monitor that pipe. If it gets closed (e.g. because the parent died), the child exits. This is the most reliable way to avoid stale children; before, if we failed an assertion, the parent would abort, and not run kill(). https://bugzilla.gnome.org/show_bug.cgi?id=621034
84 lines
1.9 KiB
C
84 lines
1.9 KiB
C
#include <gio.h>
|
|
#include <gstdio.h>
|
|
#include <string.h>
|
|
|
|
#ifdef G_OS_UNIX
|
|
#include <stdlib.h>
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
static gboolean action3_added = FALSE;
|
|
|
|
static void
|
|
on_app_action (GApplication *application,
|
|
const gchar *action_name,
|
|
guint action_timestamp)
|
|
{
|
|
if (strcmp (action_name, "action1") == 0)
|
|
exit (1);
|
|
else if (strcmp (action_name, "action2") == 0)
|
|
{
|
|
if (action3_added)
|
|
g_application_remove_action (application, "action3");
|
|
else
|
|
g_application_add_action (application, "action3", "An extra action");
|
|
action3_added = !action3_added;
|
|
}
|
|
}
|
|
|
|
static void
|
|
on_app_activated (GApplication *application,
|
|
GVariant *args,
|
|
GVariant *platform_data)
|
|
{
|
|
}
|
|
|
|
static gboolean
|
|
on_monitor_fd_io (GIOChannel *source,
|
|
GIOCondition condition,
|
|
gpointer data)
|
|
{
|
|
exit (0);
|
|
return FALSE;
|
|
}
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
GApplication *app;
|
|
|
|
#ifdef G_OS_UNIX
|
|
{
|
|
const char *slave_fd_env = g_getenv ("_G_TEST_SLAVE_FD");
|
|
if (slave_fd_env)
|
|
{
|
|
int slave_fd = atoi (slave_fd_env);
|
|
fcntl (slave_fd, F_SETFD, FD_CLOEXEC);
|
|
g_io_add_watch (g_io_channel_unix_new (slave_fd), G_IO_HUP | G_IO_ERR,
|
|
on_monitor_fd_io, NULL);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
app = g_application_new ("org.gtk.test.app");
|
|
if (!(argc > 1 && strcmp (argv[1], "--non-unique") == 0))
|
|
g_application_register_with_data (app, argc, argv, NULL);
|
|
|
|
if (g_application_is_remote (app))
|
|
{
|
|
g_application_invoke_action (app, "action1", 0);
|
|
}
|
|
else
|
|
{
|
|
g_application_add_action (app, "action1", "Action1");
|
|
g_application_add_action (app, "action2", "Action2");
|
|
g_signal_connect (app, "action",
|
|
G_CALLBACK (on_app_action), NULL);
|
|
g_signal_connect (app, "prepare-activation",
|
|
G_CALLBACK (on_app_activated), NULL);
|
|
g_application_run (app);
|
|
}
|
|
|
|
return 0;
|
|
}
|