luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix yet more test regressions...

Browse Source
This commit is contained in:
Ryan Lortie 2013-05-27 18:34:33 -04:00
parent 42139d4637
commit 7336a1e745
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/tests/gdbus-connection-slow.c
View File

@ -28,7 +28,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;
@ -91,7 +91,7 @@ test_connection_flush (void)
gchar *path; gchar *path;
error = NULL; error = NULL;
path = g_build_filename (datapath, "gdbus-connection-flush-helper", NULL); path = g_build_filename (binpath, "gdbus-connection-flush-helper", NULL);
ret = g_spawn_command_line_sync (path, ret = g_spawn_command_line_sync (path,
NULL, /* stdout */ NULL, /* stdout */
NULL, /* stderr */ NULL, /* stderr */
@ -194,7 +194,7 @@ test_connection_large_message (void)
session_bus_up (); session_bus_up ();
/* 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);
@ -222,9 +222,9 @@ main (int argc,
char *argv[]) char *argv[])
{ {
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);

10
gio/tests/gdbus-proxy.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;
@ -783,7 +783,7 @@ test_proxy (void)
g_assert_no_error (error); g_assert_no_error (error);
/* 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);
@ -849,7 +849,7 @@ test_async (void)
NULL); 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);
@ -922,9 +922,9 @@ main (int argc,
GDBusNodeInfo *introspection_data = NULL; GDBusNodeInfo *introspection_data = NULL;
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);