diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2014-08-21 11:32:38 -0500 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-08-22 17:47:33 +0300 |
| commit | c7210434d45cff0135e42bd3047988e1274d49dd (patch) | |
| tree | d02d76301beeda015f4ecaee650800173cd0487a /desktop-shell | |
| parent | 3d3f48548ad4691fbc7fbc12486ff61bca0779df (diff) | |
| download | weston-c7210434d45cff0135e42bd3047988e1274d49dd.tar.gz weston-c7210434d45cff0135e42bd3047988e1274d49dd.tar.bz2 weston-c7210434d45cff0135e42bd3047988e1274d49dd.zip | |
tests: allow running make check without make install
desktop shell and weston keyboard both refer to themselves prefixed by
LIBEXECDIR, however this is only valid once installed. make check will
currently either fail or run pre-existing versions.
This patch adds a way to override that location by setting the env var
WESTON_BUILD_DIR - which is then set by the test env script so make check
will test the versions in the build directory regardless of whether they're
installed or not.
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index 20536d75..99f3343f 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -567,7 +567,7 @@ shell_configuration(struct desktop_shell *shell) { struct weston_config_section *section; int duration; - char *s; + char *s, *client; section = weston_config_get_section(shell->compositor->config, "screensaver", NULL, NULL); @@ -578,8 +578,11 @@ shell_configuration(struct desktop_shell *shell) section = weston_config_get_section(shell->compositor->config, "shell", NULL, NULL); + asprintf(&client, "%s/%s", weston_config_get_libexec_dir(), + WESTON_SHELL_CLIENT); weston_config_section_get_string(section, - "client", &s, LIBEXECDIR "/" WESTON_SHELL_CLIENT); + "client", &s, client); + free(client); shell->client = s; weston_config_section_get_string(section, "binding-modifier", &s, "super"); |