From e908142da6e27a8e38f29895770d5d40f8587498 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 11 Feb 2019 17:34:16 +0100 Subject: [PATCH] build: also build eo-tests with debug profile this checks that eo-dbg is also working in the same manner as normal eo Reviewed-by: Stefan Schmidt Differential Revision: https://phab.enlightenment.org/D7911 --- src/lib/eo/meson.build | 9 ++++++++- src/tests/eo/access/meson.build | 12 ++++++++++++ src/tests/eo/children/meson.build | 12 ++++++++++++ src/tests/eo/composite_objects/meson.build | 12 ++++++++++++ src/tests/eo/constructors/meson.build | 12 ++++++++++++ src/tests/eo/function_overrides/meson.build | 12 ++++++++++++ src/tests/eo/interface/meson.build | 12 ++++++++++++ src/tests/eo/mixin/meson.build | 11 +++++++++++ src/tests/eo/signals/meson.build | 12 ++++++++++++ src/tests/eo/suite/meson.build | 13 +++++++++++++ 10 files changed, 116 insertions(+), 1 deletion(-) diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build index e8b32c424c..1e344293ef 100644 --- a/src/lib/eo/meson.build +++ b/src/lib/eo/meson.build @@ -50,7 +50,7 @@ eo_lib = library('eo', version : meson.project_version() ) -library('eo_dbg', +eo_lib_dbg = library('eo_dbg', eo_src, pub_eo_file_target, dependencies: [eina, valgrind, dl, execinfo], install: true, @@ -65,6 +65,13 @@ eo = declare_dependency( dependencies: eo_deps + eo_pub_deps, ) +eo_dbg = declare_dependency( + include_directories: [include_directories('.')], + link_with: eo_lib_dbg, + sources : pub_eo_file_target + priv_eo_file_target, + dependencies: eo_deps + eo_pub_deps, +) + install_data(pub_eo_files + pub_eo_types_files, install_dir: join_paths(eolian_include_dir, package_version_name) ) diff --git a/src/tests/eo/access/meson.build b/src/tests/eo/access/meson.build index 79bc65f982..da7fce354f 100644 --- a/src/tests/eo/access/meson.build +++ b/src/tests/eo/access/meson.build @@ -18,3 +18,15 @@ eo_access = executable('eo_access', test('eo-access', eo_access, env : test_env ) + +eo_access = executable('eo_access_dbg', + eo_access_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-access-dbg', eo_access, + env : test_env +) diff --git a/src/tests/eo/children/meson.build b/src/tests/eo/children/meson.build index e740b5cc9b..ac55d805f4 100644 --- a/src/tests/eo/children/meson.build +++ b/src/tests/eo/children/meson.build @@ -15,3 +15,15 @@ eo_children = executable('eo_children', test('eo-children', eo_children, env : test_env ) + +eo_children = executable('eo_children_dbg', + eo_children_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-children-dbg', eo_children, + env : test_env +) diff --git a/src/tests/eo/composite_objects/meson.build b/src/tests/eo/composite_objects/meson.build index 578d4fabbc..0a47e14313 100644 --- a/src/tests/eo/composite_objects/meson.build +++ b/src/tests/eo/composite_objects/meson.build @@ -17,3 +17,15 @@ eo_composite_objects = executable('eo_composite_objects', test('eo-composite-objects', eo_composite_objects, env : test_env ) + +eo_composite_objects = executable('eo_composite_objects_dbg', + eo_composite_objects_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-composite-objects-dbg', eo_composite_objects, + env : test_env +) diff --git a/src/tests/eo/constructors/meson.build b/src/tests/eo/constructors/meson.build index 612c7be3ec..b90058ce5c 100644 --- a/src/tests/eo/constructors/meson.build +++ b/src/tests/eo/constructors/meson.build @@ -29,3 +29,15 @@ eo_constructors = executable('eo_constructors', test('eo-constructors', eo_constructors, env : test_env ) + +eo_constructors = executable('eo_constructors_dbg', + eo_constructors_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-constructors-dbg', eo_constructors, + env : test_env +) diff --git a/src/tests/eo/function_overrides/meson.build b/src/tests/eo/function_overrides/meson.build index fb2b8dcadb..b616e51cce 100644 --- a/src/tests/eo/function_overrides/meson.build +++ b/src/tests/eo/function_overrides/meson.build @@ -21,3 +21,15 @@ eo_function_overrides = executable('eo_function_overrides', test('eo-function-overrides', eo_interface, env : test_env ) + +eo_function_overrides = executable('eo_function_overrides_dbg', + eo_function_overrides_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-function-overrides-dbg', eo_interface, + env : test_env +) diff --git a/src/tests/eo/interface/meson.build b/src/tests/eo/interface/meson.build index 77f725734b..16b109ac1a 100644 --- a/src/tests/eo/interface/meson.build +++ b/src/tests/eo/interface/meson.build @@ -19,3 +19,15 @@ eo_interface = executable('eo_interface', test('eo-interface', eo_interface, env : test_env ) + +eo_interface = executable('eo_interface_dbg', + eo_interface_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-interface-dbg', eo_interface, + env : test_env +) diff --git a/src/tests/eo/mixin/meson.build b/src/tests/eo/mixin/meson.build index 5ae83a9672..3e2d73a4b9 100644 --- a/src/tests/eo/mixin/meson.build +++ b/src/tests/eo/mixin/meson.build @@ -25,3 +25,14 @@ eo_mixin = executable('eo_mixin', test('eo-mixins', eo_mixin, env : test_env ) +eo_mixin = executable('eo_mixin_dbg', + eo_mixin_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-mixins-dbg', eo_mixin, + env : test_env +) diff --git a/src/tests/eo/signals/meson.build b/src/tests/eo/signals/meson.build index 37006ac3fc..3786367657 100644 --- a/src/tests/eo/signals/meson.build +++ b/src/tests/eo/signals/meson.build @@ -15,3 +15,15 @@ eo_signals = executable('eo_signals', test('eo-signals', eo_signals, env : test_env ) + +eo_signals = executable('eo_signals_dbg', + eo_signals_src, + dependencies: [eo_dbg], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-signals-dbg', eo_signals, + env : test_env +) diff --git a/src/tests/eo/suite/meson.build b/src/tests/eo/suite/meson.build index 39f73787e7..d7f8ae3fd4 100644 --- a/src/tests/eo/suite/meson.build +++ b/src/tests/eo/suite/meson.build @@ -32,3 +32,16 @@ eo_suite = executable('eo_suite', test('eo-suite', eo_suite, env : test_env ) + +eo_suite = executable('eo_suite_dbg', + eo_suite_src, + dependencies: [eo_dbg, check, valgrind], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DEO_DEBUG=1', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eo-suite-dbg', eo_suite, + env : test_env +)