[glib] More srcdir != destdir tests fallout
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] More srcdir != destdir tests fallout
- Date: Mon, 27 May 2013 22:27:41 +0000 (UTC)
commit 8f87d428a6c8c91aaa47daaaff2d843b6536a88c
Author: Ryan Lortie <desrt desrt ca>
Date: Mon May 27 18:27:14 2013 -0400
More srcdir != destdir tests fallout
gio/tests/resources.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index 63ace3d..eb7d1b7 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -23,7 +23,7 @@
#include "gconstructor.h"
#include "test_resources2.h"
-const gchar *datapath;
+const gchar *datapath, *libpath;
static void
test_resource (GResource *resource)
@@ -408,7 +408,7 @@ test_resource_module (void)
{
char *path;
- path = g_build_filename (datapath, "libresourceplugin", NULL);
+ path = g_build_filename (libpath, "libresourceplugin", NULL);
module = g_io_module_new (path);
g_free (path);
@@ -642,9 +642,15 @@ main (int argc,
char *argv[])
{
if (g_getenv ("G_TEST_DATA"))
- datapath = g_getenv ("G_TEST_DATA");
+ {
+ datapath = g_getenv ("G_TEST_DATA");
+ libpath = g_getenv ("G_TEST_DATA");
+ }
else
- datapath = SRCDIR;
+ {
+ datapath = SRCDIR;
+ libpath = ".libs";
+ }
g_test_init (&argc, &argv, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]