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

gio/tests: Fix gapplication test in installed mode

Browse Source
This commit is contained in:
Colin Walters 2013-05-20 21:43:52 +01:00
parent 1a398b2e56
commit 7ee44da5cf
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gio/tests/gapplication.c
View File

@ -6,6 +6,8 @@
#include "gdbus-tests.h" #include "gdbus-tests.h"
#include "gdbus-sessionbus.h" #include "gdbus-sessionbus.h"
static const gchar *datapath;
static gint outstanding_watches; static gint outstanding_watches;
static GMainLoop *main_loop; static GMainLoop *main_loop;
@ -65,7 +67,7 @@ spawn (const gchar *expected_stdout,
va_start (ap, first_arg); va_start (ap, first_arg);
array = g_ptr_array_new (); array = g_ptr_array_new ();
g_ptr_array_add (array, g_strdup ("./basic-application")); g_ptr_array_add (array, g_build_filename (datapath, "basic-application", NULL));
for (arg = first_arg; arg; arg = va_arg (ap, const gchar *)) for (arg = first_arg; arg; arg = va_arg (ap, const gchar *))
g_ptr_array_add (array, g_strdup (arg)); g_ptr_array_add (array, g_strdup (arg));
g_ptr_array_add (array, NULL); g_ptr_array_add (array, NULL);
@ -320,7 +322,8 @@ nodbus_activate (GApplication *app)
static void static void
test_nodbus (void) test_nodbus (void)
{ {
gchar *argv[] = { "./unimportant", NULL }; char *binpath = g_build_filename (datapath, "unimportant", NULL);
gchar *argv[] = { binpath, NULL };
GApplication *app; GApplication *app;
app = g_application_new ("org.gtk.Unimportant", G_APPLICATION_FLAGS_NONE); app = g_application_new ("org.gtk.Unimportant", G_APPLICATION_FLAGS_NONE);
@ -329,6 +332,7 @@ test_nodbus (void)
g_object_unref (app); g_object_unref (app);
g_assert (nodbus_activated); g_assert (nodbus_activated);
g_free (binpath);
} }
static gboolean noappid_activated; static gboolean noappid_activated;
@ -348,7 +352,8 @@ noappid_activate (GApplication *app)
static void static void
test_noappid (void) test_noappid (void)
{ {
gchar *argv[] = { "./unimportant", NULL }; char *binpath = g_build_filename (datapath, "unimportant", NULL);
gchar *argv[] = { binpath, NULL };
GApplication *app; GApplication *app;
app = g_application_new (NULL, G_APPLICATION_FLAGS_NONE); app = g_application_new (NULL, G_APPLICATION_FLAGS_NONE);
@ -357,6 +362,7 @@ test_noappid (void)
g_object_unref (app); g_object_unref (app);
g_assert (noappid_activated); g_assert (noappid_activated);
g_free (binpath);
} }
@ -385,7 +391,8 @@ static void
test_quit (void) test_quit (void)
{ {
GDBusConnection *c; GDBusConnection *c;
gchar *argv[] = { "./unimportant", NULL }; char *binpath = g_build_filename (datapath, "unimportant", NULL);
gchar *argv[] = { binpath, NULL };
GApplication *app; GApplication *app;
session_bus_up (); session_bus_up ();
@ -401,6 +408,7 @@ test_quit (void)
g_assert (quit_activated); g_assert (quit_activated);
session_bus_down (); session_bus_down ();
g_free (binpath);
} }
static void static void
@ -439,7 +447,8 @@ on_activate (GApplication *app)
static void static void
test_actions (void) test_actions (void)
{ {
gchar *argv[] = { "./unimportant", NULL }; char *binpath = g_build_filename (datapath, "unimportant", NULL);
gchar *argv[] = { binpath, NULL };
GApplication *app; GApplication *app;
g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
@ -449,6 +458,7 @@ test_actions (void)
g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL); g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL);
g_application_run (app, 1, argv); g_application_run (app, 1, argv);
g_object_unref (app); g_object_unref (app);
g_free (binpath);
} }
typedef GApplication TestLocCmdApp; typedef GApplication TestLocCmdApp;
@ -493,7 +503,8 @@ test_loc_cmd_app_class_init (TestLocCmdAppClass *klass)
static void static void
test_local_command_line (void) test_local_command_line (void)
{ {
gchar *argv[] = { "./unimportant", "-invalid", NULL }; char *binpath = g_build_filename (datapath, "unimportant", NULL);
gchar *argv[] = { binpath, "-invalid", NULL };
GApplication *app; GApplication *app;
g_unsetenv ("DBUS_SESSION_BUS_ADDRESS"); g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
@ -504,11 +515,16 @@ test_local_command_line (void)
NULL); NULL);
g_application_run (app, 1, argv); g_application_run (app, 1, argv);
g_object_unref (app); g_object_unref (app);
g_free (binpath);
} }
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
if (g_getenv ("G_TEST_DATA"))
datapath = g_getenv ("G_TEST_DATA");
else
datapath = SRCDIR;
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_dbus_unset (); g_test_dbus_unset ();