From 7336a1e745907104ec7fab9f2086c2fc93ef8b9d Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 27 May 2013 18:34:33 -0400 Subject: [PATCH] Fix yet more test regressions... --- gio/tests/gdbus-connection-slow.c | 10 +++++----- gio/tests/gdbus-proxy.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gio/tests/gdbus-connection-slow.c b/gio/tests/gdbus-connection-slow.c index e4b79df12..f94e3866e 100644 --- a/gio/tests/gdbus-connection-slow.c +++ b/gio/tests/gdbus-connection-slow.c @@ -28,7 +28,7 @@ #include "gdbus-tests.h" -static const gchar *datapath; +static const gchar *binpath; /* all tests rely on a shared mainloop */ static GMainLoop *loop = NULL; @@ -91,7 +91,7 @@ test_connection_flush (void) gchar *path; 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, NULL, /* stdout */ NULL, /* stderr */ @@ -194,7 +194,7 @@ test_connection_large_message (void) session_bus_up (); /* 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_free (path); @@ -222,9 +222,9 @@ main (int argc, char *argv[]) { if (g_getenv ("G_TEST_DATA")) - datapath = g_getenv ("G_TEST_DATA"); + binpath = g_getenv ("G_TEST_DATA"); else - datapath = SRCDIR; + binpath = "."; g_test_init (&argc, &argv, NULL); diff --git a/gio/tests/gdbus-proxy.c b/gio/tests/gdbus-proxy.c index 9fe8ef995..f4e318125 100644 --- a/gio/tests/gdbus-proxy.c +++ b/gio/tests/gdbus-proxy.c @@ -26,7 +26,7 @@ #include "gdbus-tests.h" -static const gchar *datapath; +static const gchar *binpath; /* all tests rely on a shared mainloop */ static GMainLoop *loop = NULL; @@ -783,7 +783,7 @@ test_proxy (void) g_assert_no_error (error); /* 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_free (path); @@ -849,7 +849,7 @@ test_async (void) NULL); /* 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_free (path); @@ -922,9 +922,9 @@ main (int argc, GDBusNodeInfo *introspection_data = NULL; if (g_getenv ("G_TEST_DATA")) - datapath = g_getenv ("G_TEST_DATA"); + binpath = g_getenv ("G_TEST_DATA"); else - datapath = SRCDIR; + binpath = "."; g_test_init (&argc, &argv, NULL);