[gjs] installed-tests: Prepend pkglibdir to library path
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] installed-tests: Prepend pkglibdir to library path
- Date: Fri, 13 Jan 2017 05:44:09 +0000 (UTC)
commit 880c6238b0a060b011e87526c244d0be9072e692
Author: Philip Chimento <philip chimento gmail com>
Date: Wed Jan 11 22:08:08 2017 -0800
installed-tests: Prepend pkglibdir to library path
Typelibs don't include the full path to the shared library on every
platform, so we need to add pkglibdir to GIRespository's library search
path when running the tests installed.
https://bugzilla.gnome.org/show_bug.cgi?id=776938
Makefile-test.am | 1 +
installed-tests/minijasmine.cpp | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index bcf6592..417b1ee 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -119,6 +119,7 @@ minijasmine_CPPFLAGS = \
$(GJS_CFLAGS) \
-I$(top_srcdir) \
-DINSTTESTDIR=\"$(gjsinsttestdir)\" \
+ -DPKGLIBDIR=\"$(pkglibdir)\" \
$(NULL)
minijasmine_LDADD = $(GJS_LIBS) libgjs.la
diff --git a/installed-tests/minijasmine.cpp b/installed-tests/minijasmine.cpp
index abac96a..1e3b333 100644
--- a/installed-tests/minijasmine.cpp
+++ b/installed-tests/minijasmine.cpp
@@ -63,6 +63,7 @@ main(int argc, char **argv)
g_irepository_prepend_search_path(g_getenv("TOP_BUILDDIR"));
} else {
g_irepository_prepend_search_path(INSTTESTDIR);
+ g_irepository_prepend_library_path(PKGLIBDIR);
}
const char *coverage_prefix = g_getenv("GJS_UNIT_COVERAGE_PREFIX");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]