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 gdbus-connection when run from "make check"

Browse Source
This commit is contained in:
Colin Walters 2013-05-21 09:21:21 -04:00
parent 7ff5c08221
commit bb1a5ca9a8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/tests/Makefile.am
View File

@ -136,6 +136,7 @@ other_progs = \
gdbus-testserver \ gdbus-testserver \
gdbus-connection-flush-helper \ gdbus-connection-flush-helper \
$(NULL) $(NULL)
noinst_PROGRAMS += $(other_progs)
if OS_UNIX if OS_UNIX
test_progs += \ test_progs += \

12
gio/tests/gdbus-connection.c
View File

@ -28,7 +28,8 @@
#include "gdbus-tests.h" #include "gdbus-tests.h"
const gchar *datapath; const gchar *srcdir;
const gchar *builddir;
/* all tests rely on a shared mainloop */ /* all tests rely on a shared mainloop */
static GMainLoop *loop = NULL; static GMainLoop *loop = NULL;
@ -1004,7 +1005,7 @@ test_connection_filter (void)
g_assert_cmpint (data.num_outgoing, ==, 4); g_assert_cmpint (data.num_outgoing, ==, 4);
/* 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 (builddir, "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);
@ -1228,9 +1229,12 @@ main (int argc,
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
if (g_getenv ("G_TEST_DATA")) if (g_getenv ("G_TEST_DATA"))
datapath = g_getenv ("G_TEST_DATA"); srcdir = builddir = g_getenv ("G_TEST_DATA");
else else
datapath = SRCDIR; {
srcdir = SRCDIR;
builddir = ".";
}
/* all the tests rely on a shared main loop */ /* all the tests rely on a shared main loop */
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);