This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit 3a5673f29c58d3406145cb541462f6405ea0ecdd
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 14:23:35 2024 +0500
meson: join_path - clean src/tests
---
src/tests/ecore/meson.build | 12 ++++++------
src/tests/edje/data/meson.build | 2 +-
src/tests/edje/tests/meson.build | 2 +-
src/tests/efl_mono/meson.build | 13 ++++++-------
src/tests/efreet/meson.build | 4 ++--
src/tests/eina_cxx/meson.build | 6 +++---
src/tests/elementary/meson.build | 16 ++++++++--------
src/tests/elementary/spec/meson.build | 10 +++++-----
src/tests/elua/meson.build | 8 ++++----
src/tests/emotion/data/meson.build | 2 +-
src/tests/eolian/meson.build | 12 ++++++------
src/tests/eolian_cxx/meson.build | 12 ++++++------
src/tests/evas/meson.build | 6 +++---
13 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/src/tests/ecore/meson.build b/src/tests/ecore/meson.build
index e30b944148..1d4355beba 100644
--- a/src/tests/ecore/meson.build
+++ b/src/tests/ecore/meson.build
@@ -36,9 +36,9 @@ foreach eo_file : test_eo_files
depfile : eo_file + '.d',
install : false,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -92,9 +92,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
diff --git a/src/tests/edje/data/meson.build b/src/tests/edje/data/meson.build
index 2148b861dc..40ecc8be3e 100644
--- a/src/tests/edje/data/meson.build
+++ b/src/tests/edje/data/meson.build
@@ -26,7 +26,7 @@ foreach edc_file : edc_files
input : edc_file,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
+ '-id', meson.source_root() / 'src/tests/emotion/data',
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
'-vd', meson.current_source_dir(),
diff --git a/src/tests/edje/tests/meson.build b/src/tests/edje/tests/meson.build
index 3d3f4313ad..f81f2f25e2 100644
--- a/src/tests/edje/tests/meson.build
+++ b/src/tests/edje/tests/meson.build
@@ -7,7 +7,7 @@ foreach edc_file : edc_files
input : edc_file,
output : '@BASENAME@.edj',
command : edje_cc_exe + [ '-beta', '-fastcomp',
- '-id', join_paths(meson.source_root(), 'src', 'tests', 'emotion', 'data'),
+ '-id', meson.source_root() / 'src/tests/emotion/data',
'-fd', meson.current_source_dir(),
'-sd', meson.current_source_dir(),
'-vd', meson.current_source_dir(),
diff --git a/src/tests/efl_mono/meson.build b/src/tests/efl_mono/meson.build
index 9c715893df..34693408e5 100644
--- a/src/tests/efl_mono/meson.build
+++ b/src/tests/efl_mono/meson.build
@@ -22,8 +22,8 @@ foreach eo_file : eo_files + private_eo_files
input : eo_file,
output : [eo_file + '.h'],
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
'-gch', '@INPUT@'])
endforeach
@@ -53,7 +53,7 @@ foreach mono_gen_file : eo_files
output : [mono_gen_file + '.cs'],
command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
'--dllimport', 'efl_mono_native_test',
- '-o', join_paths(meson.current_build_dir(), mono_gen_file + '.cs'),
+ '-o', meson.current_build_dir() / mono_gen_file + '.cs',
'@INPUT@'])
endforeach
@@ -91,10 +91,9 @@ if get_option('dotnet')
dotnet_test_conf_data = configuration_data()
dotnet_test_conf_data.set('EFL_VERSION', meson.project_version())
- dotnet_test_conf_data.set('BINDING_BUILD', join_paths(meson.current_build_dir(),
- '..', '..', 'bindings', 'mono'))
+ dotnet_test_conf_data.set('BINDING_BUILD', meson.current_build_dir() / '../../bindings/mono')
dotnet_test_conf_data.set('BINDING_TEST_SRC', meson.current_source_dir())
- dotnet_test_conf_data.set('CA_RULESET', join_paths(meson.build_root(), '@0@'.format(ca_ruleset)))
+ dotnet_test_conf_data.set('CA_RULESET', meson.build_root() / '@0@'.format(ca_ruleset))
dotnet_test_conf_data.set('NETCOREAPP_VERSION', dotnet_core_app_version)
@@ -168,7 +167,7 @@ env_mono.set('LD_LIBRARY_PATH', load_lib)
if get_option('dotnet')
test('efl-mono-suite',
dotnet,
- args: [join_paths(meson.current_build_dir(), 'efl_sharp_test_suite.dll')],
+ args: meson.current_build_dir() / 'efl_sharp_test_suite.dll',
env: env_mono,
)
else
diff --git a/src/tests/efreet/meson.build b/src/tests/efreet/meson.build
index 5db07c5ce8..954f6b22b4 100644
--- a/src/tests/efreet/meson.build
+++ b/src/tests/efreet/meson.build
@@ -50,8 +50,8 @@ additional_tests = [
'efreet_spec_test',
'efreet_icon_cache_dump',
'efreet_user_dir',
- join_paths('compare', 'efreet_alloc'),
- join_paths('compare', 'efreet_menu_alloc')
+ 'compare/efreet_alloc',
+ 'compare/efreet_menu_alloc'
]
foreach additional_test : additional_tests
diff --git a/src/tests/eina_cxx/meson.build b/src/tests/eina_cxx/meson.build
index facad4a9af..3d54e66838 100644
--- a/src/tests/eina_cxx/meson.build
+++ b/src/tests/eina_cxx/meson.build
@@ -28,14 +28,14 @@ foreach eo_file : pub_eo_files
input : eo_file,
output : [eo_file + '.h'],
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
'-gch', '@INPUT@'])
priv_eo_file_target += custom_target('eolian_cxx_gen_eina_cxx_' + eo_file,
input : eo_file,
output : [eo_file + '.hh'],
command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', join_paths(meson.current_build_dir(), eo_file + '.hh'),
+ '-o', meson.current_build_dir() / eo_file + '.hh',
'@INPUT@'])
endforeach
diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build
index 90249fda9d..18f578dbad 100644
--- a/src/tests/elementary/meson.build
+++ b/src/tests/elementary/meson.build
@@ -14,9 +14,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -113,8 +113,8 @@ elementary_suite = executable('elementary_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
- '-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
@@ -177,8 +177,8 @@ efl_ui_suite = executable('efl_ui_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
- '-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
@@ -203,6 +203,6 @@ test('efl-ui-suite', efl_ui_suite,
)
install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']),
- install_dir : join_paths(dir_data, 'elementary')
+ install_dir : dir_data / 'elementary'
)
subdir('spec')
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index 2ec21f5908..e740995979 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -16,9 +16,9 @@ efl_ui_suite_behavior_test_files = files([
])
efl_ui_suite_behavior_src = files([
- join_paths('..','suite_helpers.c'),
- join_paths('..','suite_helpers.h'),
- join_paths('..','elm_test_init.c'),
+ '../suite_helpers.c',
+ '../suite_helpers.h',
+ '../elm_test_init.c',
'efl_ui_spec_suite.c',
'efl_test_container.c',
]) + efl_ui_suite_behavior_test_files
@@ -38,8 +38,8 @@ efl_ui_behavior_suite = executable('efl_ui_spec_suite',
c_args : [
'-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
'-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
- '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
- '-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"',
+ '-DELM_IMAGE_DATA_DIR="' + meson.source_root() / 'data/elementary' + '"',
+ '-DELM_TEST_DATA_DIR="' + meson.build_root() / 'data/elementary' + '"',
]
)
diff --git a/src/tests/elua/meson.build b/src/tests/elua/meson.build
index fc6829ce71..49f93f0a22 100644
--- a/src/tests/elua/meson.build
+++ b/src/tests/elua/meson.build
@@ -6,10 +6,10 @@ elua_suite_src = [
'elua_lib.c'
]
-elua_bindings_dir = join_paths(meson.source_root(), 'src', 'bindings', 'lua')
-elua_core_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'core')
-elua_modules_dir = join_paths(meson.source_root(), 'src', 'scripts', 'elua', 'modules')
-elua_apps_dir = join_paths(meson.source_root(), 'src', 'tests', 'elua', 'data', 'apps')
+elua_bindings_dir = meson.source_root() / 'src/bindings/lua'
+elua_core_dir = meson.source_root() / 'src/scripts/elua/core'
+elua_modules_dir = meson.source_root() / 'src/scripts/elua/modules'
+elua_apps_dir = meson.source_root() / 'src/tests/elua/data/apps'
elua_suite = executable('elua_suite',
elua_suite_src,
diff --git a/src/tests/emotion/data/meson.build b/src/tests/emotion/data/meson.build
index 9f6229ad81..680bae0012 100644
--- a/src/tests/emotion/data/meson.build
+++ b/src/tests/emotion/data/meson.build
@@ -19,6 +19,6 @@ foreach edc_file : edc_files
'@INPUT@', '@OUTPUT@'],
depends : edje_depends,
install : true,
- install_dir : join_paths(dir_data, 'emotion', 'data')
+ install_dir : dir_data / 'emotion/data'
)
endforeach
diff --git a/src/tests/eolian/meson.build b/src/tests/eolian/meson.build
index cd9c4f185f..5aa2e8e957 100644
--- a/src/tests/eolian/meson.build
+++ b/src/tests/eolian/meson.build
@@ -19,9 +19,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EOTEST_API',
'-gchd', '@INPUT@'])
endforeach
@@ -31,9 +31,9 @@ eolian_suite = executable('eolian_suite',
dependencies: [eolian, check, eo],
c_args : [
'-DEOLIAN_GEN="'+eolian_gen_path+'"',
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DEO_SRC_DIR="' + meson.source_root() / 'src/lib' + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('eolian', eolian_suite,
diff --git a/src/tests/eolian_cxx/meson.build b/src/tests/eolian_cxx/meson.build
index 9e0fbb366e..2d43f827c8 100644
--- a/src/tests/eolian_cxx/meson.build
+++ b/src/tests/eolian_cxx/meson.build
@@ -47,14 +47,14 @@ foreach eo_file : pub_eo_files
input : eo_file,
output : [eo_file + '.hh'],
command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', join_paths(meson.current_build_dir(), eo_file + '.hh'),
+ '-o', meson.current_build_dir() / eo_file + '.hh',
'@INPUT@'])
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
input : eo_file,
output : [eo_file + '.h'],
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
'-e', 'EOLIANCXXTEST_API',
'-gch', '@INPUT@'])
endforeach
@@ -64,9 +64,9 @@ eolian_cxx_suite = executable('eolian_cxx_suite',
dependencies: [eolian_cxx_suite_deps, eo_cxx, check],
# package_c_args contains -D definitions for the package
cpp_args : package_c_args +[
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DEO_SRC_DIR="'+join_paths(meson.source_root(), 'src', 'lib')+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DEO_SRC_DIR="' + meson.source_root() / 'src/lib' + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('eolian_cxx-suite', eolian_cxx_suite,
diff --git a/src/tests/evas/meson.build b/src/tests/evas/meson.build
index 0a3b49e1ed..4b5be4d82e 100644
--- a/src/tests/evas/meson.build
+++ b/src/tests/evas/meson.build
@@ -27,10 +27,10 @@ evas_suite_src = [
evas_suite = executable('evas_suite',
evas_suite_src,
dependencies: [evas_bin, evas, ecore_evas, dl, check, evas_ext_none_static_deps, eet], #external deps needed here since tests do include internal headers
- include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')),
+ include_directories: include_directories('../../modules/evas/engines/buffer'),
c_args : [
- '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
- '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"']
+ '-DTESTS_BUILD_DIR="' + meson.current_build_dir() + '"',
+ '-DTESTS_SRC_DIR="' + meson.current_source_dir() + '"']
)
test('evas-suite', evas_suite,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
