luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

More srcdir != destdir tests fallout

Browse Source
This commit is contained in:
Ryan Lortie 2013-05-27 18:27:14 -04:00
parent aa3db2c91b
commit 8f87d428a6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/tests/resources.c
View File

@ -23,7 +23,7 @@
#include "gconstructor.h" #include "gconstructor.h"
#include "test_resources2.h" #include "test_resources2.h"
const gchar *datapath; const gchar *datapath, *libpath;
static void static void
test_resource (GResource *resource) test_resource (GResource *resource)
@ -408,7 +408,7 @@ test_resource_module (void)
{ {
char *path; char *path;
path = g_build_filename (datapath, "libresourceplugin", NULL); path = g_build_filename (libpath, "libresourceplugin", NULL);
module = g_io_module_new (path); module = g_io_module_new (path);
g_free (path); g_free (path);
@ -642,9 +642,15 @@ main (int argc,
char *argv[]) char *argv[])
{ {
if (g_getenv ("G_TEST_DATA")) 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 else
datapath = SRCDIR; {
datapath = SRCDIR;
libpath = ".libs";
}
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);