From 22c0f86c95797f7785212a1edaf454a239531c8e Mon Sep 17 00:00:00 2001 From: wanghaixiang Date: Tue, 14 Sep 2021 10:38:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TDD=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanghaixiang --- interfaces/innerkits/huks_lite/BUILD.gn | 62 ++++++++++---------- test/BUILD.gn | 4 +- test/unittest/src/common/BUILD.gn | 3 +- test/unittest/src/liteos_a_adapter/BUILD.gn | 6 +- test/unittest/src/liteos_m_adapter/BUILD.gn | 8 +-- test/unittest/src/liteos_m_adapter/Test.json | 2 +- 6 files changed, 43 insertions(+), 42 deletions(-) diff --git a/interfaces/innerkits/huks_lite/BUILD.gn b/interfaces/innerkits/huks_lite/BUILD.gn index 229833609..42defc627 100755 --- a/interfaces/innerkits/huks_lite/BUILD.gn +++ b/interfaces/innerkits/huks_lite/BUILD.gn @@ -13,32 +13,32 @@ # limitations under the License. # -import("//build/lite/config/component/lite_component.gni") import("//base/security/huks/build/config.gni") +import("//build/lite/config/component/lite_component.gni") huks_sources = [ - "../../../services/huks_standard/huks_service/main/core/src/hks_client_check.c", - "../../../services/huks_standard/huks_service/main/core/src/hks_client_service.c", - "../../../services/huks_standard/huks_service/main/core/src/hks_client_service_adapter_lite.c", - "../../../frameworks/huks_standard/main/os_dependency/ipc/src/hks_client_service_passthrough.c", - "../../../services/huks_standard/huks_service/main/os_dependency/posix/hks_file_operator_lite.c", - "../../../services/huks_standard/huks_service/main/core/src/hks_upgrade_storage_data.c", + "../../../frameworks/huks_standard/main/common/src/hks_base_check.c", + "../../../frameworks/huks_standard/main/common/src/hks_check_paramset.c", "../../../frameworks/huks_standard/main/common/src/hks_common_check.c", "../../../frameworks/huks_standard/main/common/src/hks_crypto_adapter.c", - "../../../frameworks/huks_standard/main/os_dependency/sysinfo/src/hks_get_process_info_passthrough.c", - "../../../frameworks/huks_standard/main/os_dependency/sysinfo/src/hks_get_udid.c", "../../../frameworks/huks_standard/main/common/src/hks_param.c", - "../../../frameworks/huks_standard/main/os_dependency/posix/hks_mem.c", "../../../frameworks/huks_standard/main/core/src/hks_local_engine.c", + "../../../frameworks/huks_standard/main/os_dependency/ipc/src/hks_client_service_passthrough.c", + "../../../frameworks/huks_standard/main/os_dependency/posix/hks_mem.c", + "../../../frameworks/huks_standard/main/os_dependency/sysinfo/src/hks_get_process_info_passthrough.c", + "../../../frameworks/huks_standard/main/os_dependency/sysinfo/src/hks_get_udid.c", + "../../../interfaces/innerkits/huks_standard/main/src/hks_api.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_auth.c", - "../../../frameworks/huks_standard/main/common/src/hks_base_check.c", - "../../../frameworks/huks_standard/main/common/src/hks_check_paramset.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_core_service.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_keyblob.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_rkc.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_rkc_rw.c", "../../../services/huks_standard/huks_engine/main/core/src/hks_upgrade_key_info.c", - "../../../interfaces/innerkits/huks_standard/main/src/hks_api.c", + "../../../services/huks_standard/huks_service/main/core/src/hks_client_check.c", + "../../../services/huks_standard/huks_service/main/core/src/hks_client_service.c", + "../../../services/huks_standard/huks_service/main/core/src/hks_client_service_adapter_lite.c", + "../../../services/huks_standard/huks_service/main/core/src/hks_upgrade_storage_data.c", + "../../../services/huks_standard/huks_service/main/os_dependency/posix/hks_file_operator_lite.c", ] if (huks_use_mbedtls == true) { @@ -59,8 +59,7 @@ if (huks_use_mbedtls == true) { ] } -huks_access_sources = - [ "../../../services/huks_standard/huks_service/main/os_dependency/idl/passthrough/hks_passthrough_access.c" ] +huks_access_sources = [ "../../../services/huks_standard/huks_service/main/os_dependency/idl/passthrough/hks_passthrough_access.c" ] if (huks_use_lite_storage == true) { huks_storage_source = [ @@ -69,7 +68,9 @@ if (huks_use_lite_storage == true) { "../../../services/huks_standard/huks_engine/main/core/src/hks_keyblob_lite.c", ] } else { - huks_storage_source = [ "../../../services/huks_standard/huks_service/main/core/src/hks_storage.c" ] + huks_storage_source = [ + "../../../services/huks_standard/huks_service/main/core/src/hks_storage.c", + ] } config("hilog_dir") { include_dirs = @@ -140,16 +141,12 @@ config("soft_huks_config") { } config("public_huks_config") { - include_dirs = [ - "../../../interfaces/innerkits/huks_standard/main/include", - ] + include_dirs = [ "../../../interfaces/innerkits/huks_standard/main/include" ] } config("get_dev_udid_config") { cflags = [ "-DGET_DEV_UDID_ENABLE" ] - include_dirs = [ - "//base/startup/syspara_lite/interfaces/kits", - ] + include_dirs = [ "//base/startup/syspara_lite/interfaces/kits" ] } #begin: add @@ -166,6 +163,7 @@ if (ohos_kernel_type == "liteos_m") { if (huks_use_mbedtls == true) { sources += huks_mbedtls_engine_sources deps = [] + #deps += [ "//build/lite/config/component/openssl:openssl_static" ] if (huks_mbedtls_path == "//third_party/mbedtls/include") { deps += [ "//third_party/mbedtls:mbedtls_static" ] @@ -180,8 +178,8 @@ if (ohos_kernel_type == "liteos_m") { } } #if (ohos_build_type == "debug") { - # group("huks_new_test") { - # deps = [ "//base/security/huks/test:huks_new_test" ] + # group("huks_3.0_test") { + # deps = [ "//base/security/huks/test:huks_3.0_test" ] # } #} } else { @@ -192,7 +190,9 @@ if (ohos_kernel_type == "liteos_m") { sources = huks_sources sources += huks_storage_source sources += huks_access_sources - sources += [ "../../../frameworks/huks_standard/main/os_dependency/log/hks_log_lite.c" ] + sources += [ + "../../../frameworks/huks_standard/main/os_dependency/log/hks_log_lite.c", + ] deps = [ "//base/startup/syspara_lite/frameworks/parameter/src:sysparam" ] @@ -208,12 +208,12 @@ if (ohos_kernel_type == "liteos_m") { configs += [ ":hilog_dir" ] deps += [ "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//third_party/bounds_checking_function:libsec_shared", + "//third_party/bounds_checking_function:libsec_shared", ] } - #if (ohos_build_type == "debug") { - # group("huks_new_test") { - # deps = [ "//base/security/huks/test:huks_new_test" ] - # } - #} + if (ohos_build_type == "debug") { + group("huks_3.0_test") { + deps = [ "//base/security/huks/test:huks_3.0_test" ] + } + } } diff --git a/test/BUILD.gn b/test/BUILD.gn index 54e759dba..e0cd9276f 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -group("huks_new_test") { +group("huks_3.0_test") { if (ohos_kernel_type == "liteos_m") { - deps = [ "unittest/src/liteos_m_adapter:huks_new_test" ] + deps = [ "unittest/src/liteos_m_adapter:huks_3.0_test" ] } else { deps = [ "unittest/src/liteos_a_adapter:unittest" ] } diff --git a/test/unittest/src/common/BUILD.gn b/test/unittest/src/common/BUILD.gn index 6f8e7a76e..e6112f0a2 100644 --- a/test/unittest/src/common/BUILD.gn +++ b/test/unittest/src/common/BUILD.gn @@ -29,7 +29,7 @@ config("huks_test_common") { ] } -static_library("huks_new_test_common") { +static_library("huks_3.0_test_common") { sources = [ "hks_test_aes.c", "hks_test_api_performance.c", @@ -46,6 +46,7 @@ static_library("huks_new_test_common") { configs += [ ":huks_test_common" ] if (ohos_kernel_type == "liteos_m") { + cflags = [ "-D_CUT_LOG_" ] configs += [ ":hilog_lite_dir" ] deps += [ "//base/hiviewdfx/hilog_lite/frameworks/mini:hilog_lite" ] } else { diff --git a/test/unittest/src/liteos_a_adapter/BUILD.gn b/test/unittest/src/liteos_a_adapter/BUILD.gn index d892138aa..3ef87aee9 100644 --- a/test/unittest/src/liteos_a_adapter/BUILD.gn +++ b/test/unittest/src/liteos_a_adapter/BUILD.gn @@ -17,7 +17,7 @@ import("//base/security/huks/build/config.gni") import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/test.gni") -unittest("huks_new_test") { +unittest("huks_3.0_test") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/security/" sources = [ @@ -46,7 +46,7 @@ unittest("huks_new_test") { deps = [ "//base/security/huks/interfaces/innerkits/huks_lite:huks_3.0_sdk", - "//base/security/huks/test/unittest/src/common:huks_new_test_common", + "//base/security/huks/test/unittest/src/common:huks_3.0_test_common", ] cflags = [ "-Wno-error" ] @@ -56,5 +56,5 @@ unittest("huks_new_test") { } group("unittest") { - deps = [ ":huks_new_test" ] + deps = [ ":huks_3.0_test" ] } diff --git a/test/unittest/src/liteos_m_adapter/BUILD.gn b/test/unittest/src/liteos_m_adapter/BUILD.gn index ae82412fc..bcaf42e1e 100644 --- a/test/unittest/src/liteos_m_adapter/BUILD.gn +++ b/test/unittest/src/liteos_m_adapter/BUILD.gn @@ -16,8 +16,8 @@ import("//base/security/huks/build/config.gni") import("//test/xts/tools/lite/build/suite_lite.gni") -hctest_suite("huks_new_test") { - suite_name = "huks_new_test" +hctest_suite("huks_3.0_test") { + suite_name = "huks_3.0_test" sources = [ "hks_aes_test.c", "hks_agreement_test.c", @@ -43,12 +43,12 @@ hctest_suite("huks_new_test") { deps = [ #"//base/security/huks/huawei_property/source:huks_new", - "//base/security/huks/test/unittest/src/common:huks_new_test_common", + "//base/security/huks/test/unittest/src/common:huks_3.0_test_common", ] cflags = [ "-D_CUT_ED25519_", - "-D_CUT_LOG_" + "-D_CUT_LOG_", ] if (disable_authenticate == true) { cflags += [ "-D_CUT_AUTHENTICATE_" ] diff --git a/test/unittest/src/liteos_m_adapter/Test.json b/test/unittest/src/liteos_m_adapter/Test.json index e4fe1ba3f..2836f0603 100644 --- a/test/unittest/src/liteos_m_adapter/Test.json +++ b/test/unittest/src/liteos_m_adapter/Test.json @@ -20,7 +20,7 @@ ], "driver": { "type": "CppTestLite", - "execute": "/test_root/security/huks_new_test.bin" + "execute": "/test_root/security/huks_3.0_test.bin" } } -- Gitee