From 8f87d428a6c8c91aaa47daaaff2d843b6536a88c Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 27 May 2013 18:27:14 -0400 Subject: [PATCH] More srcdir != destdir tests fallout --- gio/tests/resources.c | 14 ++++++++++---- 1 file 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); -- 2.7.4