diff --git a/guile/meson.build b/guile/meson.build index 47be36be..ca051d11 100644 --- a/guile/meson.build +++ b/guile/meson.build @@ -105,4 +105,24 @@ install_data(mu_guile_scripts, install_dir: mu_guile_script_dir) guile_builddir=meson.current_build_dir() -subdir('tests') +# +# guile test; does't work wit asan. +# +if get_option('b_sanitize') == 'none' + guile_load_path=':'.join([ + join_paths(meson.project_source_root(), 'guile'), + meson.current_build_dir()]) + + test('test-mu-guile', + executable('test-mu-guile', + join_paths('tests', 'test-mu-guile.cc'), + install: false, + cpp_args: [ + '-DABS_SRCDIR="' + join_paths(meson.current_source_dir(), 'tests') + '"', + '-DGUILE_LOAD_PATH="' + guile_load_path + '"', + '-DGUILE_EXTENSIONS_PATH="' + guile_load_path + '"' + ], + dependencies: [glib_dep, lib_mu_dep])) +else + message('sanitizer build; skip guile test') +endif diff --git a/guile/tests/meson.build b/guile/tests/meson.build deleted file mode 100644 index 6b48386b..00000000 --- a/guile/tests/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -## Copyright (C) 2022 Dirk-Jan C. Binnema -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software Foundation, -## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -guile_load_path=':'.join([ - join_paths(meson.project_source_root(), 'guile'), - join_paths(meson.current_build_dir(), '..')]) - -test('test-mu-guile', - executable('test-mu-guile', - 'test-mu-guile.cc', - install: false, - cpp_args: [ - '-DABS_SRCDIR="' + meson.current_source_dir() + '"', - '-DGUILE_LOAD_PATH="' + guile_load_path + '"', - '-DGUILE_EXTENSIONS_PATH="' + guile_load_path + '"' - ], - dependencies: [glib_dep, lib_mu_dep])) diff --git a/meson.build b/meson.build index ce923f09..834a18c7 100644 --- a/meson.build +++ b/meson.build @@ -31,7 +31,7 @@ project('mu', ['c', 'cpp'], # installation paths prefixdir = get_option('prefix') -bindir = prefixdir / get_option('bindir') +bindir = prefixdir / get_option('bindir') datadir = prefixdir / get_option('datadir') mandir = prefixdir / get_option('mandir') infodir = prefixdir / get_option('infodir')