From 3f86e50be01dd797a7eb1988abe5c5c9951e7688 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 8 Jun 2015 11:46:54 -0500 Subject: [PATCH] compositor: Respect WESTON_BUILD_DIR env var in weston_load_module We were loading modules out of the system dirs unconditionally, so tests that loaded modules would use the system ones, or fail if they weren't installed. Signed-off-by: Derek Foreman Reviewed-By: Pekka Paalanen Reviewed-by: Jon A. Cruz Reviewed-by: Bryce Harrington --- src/compositor.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index ec2be7d..66c3eee 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -4680,16 +4680,21 @@ weston_version(int *major, int *minor, int *micro) WL_EXPORT void * weston_load_module(const char *name, const char *entrypoint) { + const char *builddir = getenv("WESTON_BUILD_DIR"); char path[PATH_MAX]; void *module, *init; if (name == NULL) return NULL; - if (name[0] != '/') - snprintf(path, sizeof path, "%s/%s", MODULEDIR, name); - else + if (name[0] != '/') { + if (builddir) + snprintf(path, sizeof path, "%s/.libs/%s", builddir, name); + else + snprintf(path, sizeof path, "%s/%s", MODULEDIR, name); + } else { snprintf(path, sizeof path, "%s", name); + } module = dlopen(path, RTLD_NOW | RTLD_NOLOAD); if (module) { -- 2.7.4