From 5c15b7c51b2c7f2204bdcb94d98c985e0086dbb1 Mon Sep 17 00:00:00 2001 From: liangqi Date: Fri, 13 Jun 2025 23:13:47 +0800 Subject: [PATCH 1/4] fix three fail test because of cannot find so Signed-off-by: liangqi --- adapter/uhdf2/test/unittest/config/BUILD.gn | 5 ++++- adapter/uhdf2/test/unittest/manager/BUILD.gn | 6 ++++-- adapter/uhdf2/test/unittest/osal/BUILD.gn | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn index 4d46ae261..0f7a43a15 100644 --- a/adapter/uhdf2/test/unittest/config/BUILD.gn +++ b/adapter/uhdf2/test/unittest/config/BUILD.gn @@ -21,7 +21,10 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { module_out_path = module_output_path include_dirs = [ "$hdf_core_path/framework/test/unittest/include" ] - sources = [ "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp" ] + sources = [ + "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp", + "$hdf_core_path/framework/test/unittest/common/hdf_common_test.c" + ] resource_config_file = "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml" deps = [ diff --git a/adapter/uhdf2/test/unittest/manager/BUILD.gn b/adapter/uhdf2/test/unittest/manager/BUILD.gn index b8b9d1154..51921bafc 100644 --- a/adapter/uhdf2/test/unittest/manager/BUILD.gn +++ b/adapter/uhdf2/test/unittest/manager/BUILD.gn @@ -33,9 +33,11 @@ ohos_unittest("hdf_adapter_uhdf_test_manager") { ] defines = [ "__USER__" ] - sources = [ "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp" ] + sources = [ + "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp", + "$hdf_framework_path/test/unittest/common/hdf_common_test.c" + ] deps = [ - "$hdf_adapter_path/build/test_common:libhdf_test_common", "$hdf_adapter_path/uhdf2/utils:libhdf_utils", ] resource_config_file = diff --git a/adapter/uhdf2/test/unittest/osal/BUILD.gn b/adapter/uhdf2/test/unittest/osal/BUILD.gn index 9f3df6ea2..8e1314e32 100644 --- a/adapter/uhdf2/test/unittest/osal/BUILD.gn +++ b/adapter/uhdf2/test/unittest/osal/BUILD.gn @@ -36,9 +36,9 @@ ohos_unittest("hdf_adapter_uhdf_test_osal") { defines = [ "__USER__" ] sources = [ "$hdf_framework_path/support/posix/test/unittest/common/hdf_osal_test.cpp", + "$hdf_framework_path/test/unittest/common/hdf_common_test.c" ] deps = [ - "$hdf_adapter_path/build/test_common:libhdf_test_common", "$hdf_adapter_path/uhdf2/utils:libhdf_utils", ] resource_config_file = -- Gitee From 1987ed35d4d4a00ff9f30815adf45d4a98f82f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6?= Date: Fri, 13 Jun 2025 15:16:15 +0000 Subject: [PATCH 2/4] update adapter/uhdf2/test/unittest/config/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 梁琦 --- adapter/uhdf2/test/unittest/config/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn index 0f7a43a15..886e5daad 100644 --- a/adapter/uhdf2/test/unittest/config/BUILD.gn +++ b/adapter/uhdf2/test/unittest/config/BUILD.gn @@ -28,7 +28,6 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { resource_config_file = "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml" deps = [ - "$hdf_core_path/adapter/build/test_common:libhdf_test_common", "$hdf_uhdf_path/utils:libhdf_utils", ] if (is_standard_system) { -- Gitee From 8f7d5a9ac591f74e93359a0841eab3b33de3e52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6?= Date: Fri, 13 Jun 2025 15:16:15 +0000 Subject: [PATCH 3/4] update adapter/uhdf2/test/unittest/config/BUILD.gn. --- adapter/uhdf2/test/unittest/config/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn index 4d46ae261..9a342f253 100644 --- a/adapter/uhdf2/test/unittest/config/BUILD.gn +++ b/adapter/uhdf2/test/unittest/config/BUILD.gn @@ -25,7 +25,6 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { resource_config_file = "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml" deps = [ - "$hdf_core_path/adapter/build/test_common:libhdf_test_common", "$hdf_uhdf_path/utils:libhdf_utils", ] if (is_standard_system) { -- Gitee From 44c1ab9bf2e877a05092266fd69f87be08a535bb Mon Sep 17 00:00:00 2001 From: liangqi Date: Fri, 13 Jun 2025 23:13:47 +0800 Subject: [PATCH 4/4] fix three fail test because of cannot find so --- adapter/uhdf2/test/unittest/config/BUILD.gn | 5 ++++- adapter/uhdf2/test/unittest/manager/BUILD.gn | 6 ++++-- adapter/uhdf2/test/unittest/osal/BUILD.gn | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adapter/uhdf2/test/unittest/config/BUILD.gn b/adapter/uhdf2/test/unittest/config/BUILD.gn index 9a342f253..886e5daad 100644 --- a/adapter/uhdf2/test/unittest/config/BUILD.gn +++ b/adapter/uhdf2/test/unittest/config/BUILD.gn @@ -21,7 +21,10 @@ ohos_unittest("hdf_adapter_uhdf_test_config") { module_out_path = module_output_path include_dirs = [ "$hdf_core_path/framework/test/unittest/include" ] - sources = [ "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp" ] + sources = [ + "$hdf_core_path/framework/utils/src/hcs_parser/test/unittest/common/hdf_config_test.cpp", + "$hdf_core_path/framework/test/unittest/common/hdf_common_test.c" + ] resource_config_file = "$hdf_core_path/adapter/uhdf2/test/resource/config/ohos_test.xml" deps = [ diff --git a/adapter/uhdf2/test/unittest/manager/BUILD.gn b/adapter/uhdf2/test/unittest/manager/BUILD.gn index b8b9d1154..51921bafc 100644 --- a/adapter/uhdf2/test/unittest/manager/BUILD.gn +++ b/adapter/uhdf2/test/unittest/manager/BUILD.gn @@ -33,9 +33,11 @@ ohos_unittest("hdf_adapter_uhdf_test_manager") { ] defines = [ "__USER__" ] - sources = [ "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp" ] + sources = [ + "$hdf_framework_path/core/manager/test/unittest/common/hdf_lite_manager_test.cpp", + "$hdf_framework_path/test/unittest/common/hdf_common_test.c" + ] deps = [ - "$hdf_adapter_path/build/test_common:libhdf_test_common", "$hdf_adapter_path/uhdf2/utils:libhdf_utils", ] resource_config_file = diff --git a/adapter/uhdf2/test/unittest/osal/BUILD.gn b/adapter/uhdf2/test/unittest/osal/BUILD.gn index 9f3df6ea2..8e1314e32 100644 --- a/adapter/uhdf2/test/unittest/osal/BUILD.gn +++ b/adapter/uhdf2/test/unittest/osal/BUILD.gn @@ -36,9 +36,9 @@ ohos_unittest("hdf_adapter_uhdf_test_osal") { defines = [ "__USER__" ] sources = [ "$hdf_framework_path/support/posix/test/unittest/common/hdf_osal_test.cpp", + "$hdf_framework_path/test/unittest/common/hdf_common_test.c" ] deps = [ - "$hdf_adapter_path/build/test_common:libhdf_test_common", "$hdf_adapter_path/uhdf2/utils:libhdf_utils", ] resource_config_file = -- Gitee