summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.com>2019-02-06 13:51:55 +0200
committerDaniel Stone <daniel@fooishbar.org>2019-02-15 19:21:26 +0000
commitfcd9f674674731c7d37871034c5e9fe5166e248b (patch)
tree5db9b3dddb5bffb7e3145a98c622d31ef086c797
parentcd6bf210a44ecb2abb4aec91a84cbc167e894e06 (diff)
downloadweston-fcd9f674674731c7d37871034c5e9fe5166e248b.tar.gz
meson: set WESTON_DATA_DIR for tests
It seems WESTON_DATA_DIR was missed. If you have already installed Weston, then the files will be found in the install location, but if not, they were not found at all. This caused the xwayland test to SEGV the compositor in weston_wm_window_create_frame() when frame_crate() returned NULL. This patch fixes the test suite only. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
-rw-r--r--tests/meson.build1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/meson.build b/tests/meson.build
index ee24562b..53c55273 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -232,6 +232,7 @@ endif
env_test_weston = [
'WESTON_TEST_REFERENCE_PATH=@0@/reference'.format(meson.current_source_dir()),
'WESTON_MODULE_MAP=@0@'.format(env_modmap),
+ 'WESTON_DATA_DIR=' + join_paths(meson.current_source_dir(), '..', 'data'),
]
# FIXME: the multiple loops is lame. rethink this.