diff --git a/meson.build b/meson.build index 58af9ee1..f75522ef 100644 --- a/meson.build +++ b/meson.build @@ -45,6 +45,7 @@ dir_lib_pc = dir_lib / 'pkgconfig' dir_man = dir_prefix / get_option('mandir') dir_protocol_libweston = 'libweston-@0@'.format(libweston_major) / 'protocols' dir_sysconf = dir_prefix / get_option('sysconfdir') +dir_gitlab_ci = meson.project_source_root() / '.gitlab-ci' public_inc = include_directories('include') common_inc = [ include_directories('.'), public_inc ] diff --git a/tests/meson.build b/tests/meson.build index 6c9dc561..4f3cb6c1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -408,6 +408,13 @@ test_config_h.set_quoted('TESTSUITE_PLUGIN_PATH', exe_plugin_test.full_path()) test_config_h.set10('WESTON_TEST_SKIP_IS_FAILURE', get_option('test-skip-is-failure')) configure_file(output: 'test-config.h', configuration: test_config_h) +test_env = {} + +# there are some leaks in fontconfig we can't fix; +if get_option('b_sanitize') in ['address', 'address,undefined' ] + test_env += { 'LSAN_OPTIONS': 'suppressions=@0@'.format(dir_gitlab_ci / 'leak-sanitizer.supp') } +endif + foreach t : tests t_name = 'test-' + t.get('name') t_sources = t.get('sources', [t.get('name') + '-test.c']) @@ -434,6 +441,7 @@ foreach t : tests test( t.get('name'), t_exe, + env: test_env, depends: t.get('test_deps', []), timeout: 120, protocol: 'tap',