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

gio/tests: Make gdbus-proxy-well-known-name handle srcdir != builddir

Browse Source
This commit is contained in:
Colin Walters 2013-05-27 19:30:31 -04:00
parent 7336a1e745
commit 4ec32e6fa8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/tests/gdbus-proxy-well-known-name.c
View File

@ -26,7 +26,7 @@
#include "gdbus-tests.h" #include "gdbus-tests.h"
static const gchar *datapath; static const gchar *binpath;
/* all tests rely on a shared mainloop */ /* all tests rely on a shared mainloop */
static GMainLoop *loop = NULL; static GMainLoop *loop = NULL;
@ -101,7 +101,7 @@ test_proxy_well_known_name (void)
g_assert (g_dbus_proxy_get_cached_property_names (ap) == NULL); g_assert (g_dbus_proxy_get_cached_property_names (ap) == NULL);
/* this is safe; testserver will exit once the bus goes away */ /* this is safe; testserver will exit once the bus goes away */
path = g_build_filename (datapath, "gdbus-testserver", NULL); path = g_build_filename (binpath, "gdbus-testserver", NULL);
g_assert (g_spawn_command_line_async (path, NULL)); g_assert (g_spawn_command_line_async (path, NULL));
g_free (path); g_free (path);
@ -229,7 +229,7 @@ test_proxy_well_known_name (void)
* the 'y' property should be back at 1... * the 'y' property should be back at 1...
*/ */
/* this is safe; testserver will exit once the bus goes away */ /* this is safe; testserver will exit once the bus goes away */
path = g_build_filename (datapath, "gdbus-testserver", NULL); path = g_build_filename (binpath, "gdbus-testserver", NULL);
g_assert (g_spawn_command_line_async (path, NULL)); g_assert (g_spawn_command_line_async (path, NULL));
g_free (path); g_free (path);
@ -268,9 +268,9 @@ main (int argc,
gint ret; gint ret;
if (g_getenv ("G_TEST_DATA")) if (g_getenv ("G_TEST_DATA"))
datapath = g_getenv ("G_TEST_DATA"); binpath = g_getenv ("G_TEST_DATA");
else else
datapath = SRCDIR; binpath = ".";
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);