From 4ec32e6fa827a97c4d7fd8a8b00126d52a604319 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 27 May 2013 19:30:31 -0400 Subject: [PATCH] gio/tests: Make gdbus-proxy-well-known-name handle srcdir != builddir --- gio/tests/gdbus-proxy-well-known-name.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gio/tests/gdbus-proxy-well-known-name.c b/gio/tests/gdbus-proxy-well-known-name.c index 5d3b9ee8b..8f13977ee 100644 --- a/gio/tests/gdbus-proxy-well-known-name.c +++ b/gio/tests/gdbus-proxy-well-known-name.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; @@ -101,7 +101,7 @@ test_proxy_well_known_name (void) g_assert (g_dbus_proxy_get_cached_property_names (ap) == 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); @@ -229,7 +229,7 @@ test_proxy_well_known_name (void) * the 'y' property should be back at 1... */ /* 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); @@ -268,9 +268,9 @@ main (int argc, gint ret; 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);