[glib] gio/tests: Make gdbus-proxy-well-known-name handle srcdir != builddir
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio/tests: Make gdbus-proxy-well-known-name handle srcdir != builddir
- Date: Mon, 27 May 2013 23:31:07 +0000 (UTC)
commit 4ec32e6fa827a97c4d7fd8a8b00126d52a604319
Author: Colin Walters <walters verbum org>
Date: Mon May 27 19:30:31 2013 -0400
gio/tests: Make gdbus-proxy-well-known-name handle srcdir != builddir
gio/tests/gdbus-proxy-well-known-name.c | 10 +++++-----
1 files 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 5d3b9ee..8f13977 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]