From: Yongjoo Ahn Date: Thu, 18 Apr 2024 04:20:44 +0000 (+0900) Subject: [build] Set test daemon path by parsing mlops-agent.pc X-Git-Tag: accepted/tizen/7.0/unified/20240426.015352~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cac8ce7e69778d734c2af2394ec0754c72ab923f;p=platform%2Fcore%2Fapi%2Fmachine-learning.git [build] Set test daemon path by parsing mlops-agent.pc - Let meson parse mlops-agent.pc to get test daemon path. Signed-off-by: Yongjoo Ahn --- diff --git a/meson.build b/meson.build index 74b5f4a..f9b6cf5 100644 --- a/meson.build +++ b/meson.build @@ -167,9 +167,6 @@ api_install_bindir = join_paths(api_install_prefix, get_option('bindir')) api_install_includedir = join_paths(api_install_prefix, get_option('includedir')) api_install_inidir = get_option('sysconfdir') -# Declare path to bin directory to run mlops-agent for unittest. -add_project_arguments('-DEXEC_PREFIX="' + api_install_bindir + '"', language: ['c', 'cpp']) - # Set default configuration api_conf = configuration_data() api_conf.set('VERSION', api_version) diff --git a/tests/capi/meson.build b/tests/capi/meson.build index f5d5124..7775a0f 100644 --- a/tests/capi/meson.build +++ b/tests/capi/meson.build @@ -31,9 +31,19 @@ unittest_capi_datatype_consistency = executable('unittest_capi_datatype_consiste test('unittest_capi_datatype_consistency', unittest_capi_datatype_consistency, env: testenv, timeout: 100) if get_option('enable-ml-service') + # Declare path to bin directory to run mlops-agent for unittest. + mlops_agent_test_exec_prefix = mlops_agent_dep.get_pkgconfig_variable('exec_prefix', default: api_install_bindir) + + # Set dependency for ml-service unittests. + service_unittest_deps = [ + unittest_common_dep, + nns_capi_service_dep, + declare_dependency(compile_args : '-DEXEC_PREFIX="' + mlops_agent_test_exec_prefix + '"') + ] + unittest_capi_service_extension = executable('unittest_capi_service_extension', 'unittest_capi_service_extension.cc', - dependencies: [unittest_common_dep, nns_capi_service_dep], + dependencies: service_unittest_deps, install: get_option('install-test'), install_dir: unittest_install_dir ) @@ -41,7 +51,7 @@ if get_option('enable-ml-service') unittest_capi_service_agent_client = executable('unittest_capi_service_agent_client', 'unittest_capi_service_agent_client.cc', - dependencies: [unittest_common_dep, nns_capi_service_dep], + dependencies: service_unittest_deps, install: get_option('install-test'), install_dir: unittest_install_dir ) @@ -50,7 +60,7 @@ if get_option('enable-ml-service') if support_service_offloading unittest_capi_service_offloading = executable('unittest_capi_service_offloading', 'unittest_capi_service_offloading.cc', - dependencies: [unittest_common_dep, nns_capi_service_dep], + dependencies: service_unittest_deps, install: get_option('install-test'), install_dir: unittest_install_dir ) @@ -58,7 +68,7 @@ if get_option('enable-ml-service') unittest_capi_service_training_offloading = executable('unittest_capi_service_training_offloading', 'unittest_capi_service_training_offloading.cc', - dependencies: [unittest_common_dep, nns_capi_service_dep], + dependencies: service_unittest_deps, install: get_option('install-test'), install_dir: unittest_install_dir )