From 8bacc74b4b9332c5376f40a9406e3b6ca4957b3d Mon Sep 17 00:00:00 2001 From: guodongqi Date: Tue, 17 May 2022 16:39:21 +0800 Subject: [PATCH 1/2] fixed 1b80eb5 from https://gitee.com/guo-dongqi/drivers_adapter/pulls/575 test: code optimization Signed-off-by: guodongqi --- uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp | 4 ++-- uhdf2/include/hdi/base/hdi_smq.h | 2 +- uhdf2/test/BUILD.gn | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp b/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp index 03acd0d..be31636 100644 --- a/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp +++ b/uhdf2/hdi/test/servmgr/service_manager_hdi_test.cpp @@ -561,7 +561,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ServMgrTest012, TestSize.Level1) t[0].data64 = i + 1; t[1].data32 = i + 1; t[1].data64 = i + 1; - HDF_LOGI("%{public}s:write smq message %{public}zu", __func__, i); + HDF_LOGI("%{public}s:write smq message %{public}d", __func__, i); auto status = smq->Write(&t[0], ELEMENT_SIZE, OHOS::MillisecToNanosec(SMQ_TEST_WAIT_TIME)); ASSERT_EQ(status, 0); } @@ -603,7 +603,7 @@ HWTEST_F(HdfServiceMangerHdiTest, ServMgrTest013, TestSize.Level1) t[0].data64 = i + 1; t[1].data32 = i + 1; t[1].data64 = i + 1; - HDF_LOGI("%{public}s:write smq message %{public}zu", __func__, i); + HDF_LOGI("%{public}s:write smq message %{public}d", __func__, i); status = smq->WriteNonBlocking(&t[0], ELEMENT_SIZE); ASSERT_EQ(status, 0); } diff --git a/uhdf2/include/hdi/base/hdi_smq.h b/uhdf2/include/hdi/base/hdi_smq.h index 5c1f417..345f9fc 100644 --- a/uhdf2/include/hdi/base/hdi_smq.h +++ b/uhdf2/include/hdi/base/hdi_smq.h @@ -99,7 +99,7 @@ SharedMemQueue::SharedMemQueue(uint32_t elementCount, SmqType type) : aligned } meta_ = std::make_shared>(elementCount, type); - HDF_LOGI("create SharedMemQueue, count=%{public}u, size=%{public}u", elementCount, meta_->GetSize()); + HDF_LOGI("create SharedMemQueue, count=%{public}u, size=%{public}zu", elementCount, meta_->GetSize()); int ashmemFd = AshmemCreate("hdi_smq", Align(meta_->GetSize(), PAGE_SIZE)); if (ashmemFd < 0) { HDF_LOGE("failed to create ashmem"); diff --git a/uhdf2/test/BUILD.gn b/uhdf2/test/BUILD.gn index 6cfa3eb..ded2b82 100644 --- a/uhdf2/test/BUILD.gn +++ b/uhdf2/test/BUILD.gn @@ -22,5 +22,6 @@ group("hdf_test_uhdf") { "unittest/manager:hdf_adapter_uhdf_test_sbuf", "unittest/osal:hdf_adapter_uhdf_test_osal", "unittest/osal:hdf_adapter_uhdf_test_osal_posix", + "//drivers/framework/test/fuzztest:hdf_framework_fuzztest", ] } -- Gitee From 3072834726c4a530f4804cb3cae6c0e16d6886e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E4=B8=9C=E5=A5=87?= Date: Thu, 19 May 2022 06:32:46 +0000 Subject: [PATCH 2/2] update uhdf2/test/BUILD.gn. --- uhdf2/test/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/uhdf2/test/BUILD.gn b/uhdf2/test/BUILD.gn index ded2b82..6cfa3eb 100644 --- a/uhdf2/test/BUILD.gn +++ b/uhdf2/test/BUILD.gn @@ -22,6 +22,5 @@ group("hdf_test_uhdf") { "unittest/manager:hdf_adapter_uhdf_test_sbuf", "unittest/osal:hdf_adapter_uhdf_test_osal", "unittest/osal:hdf_adapter_uhdf_test_osal_posix", - "//drivers/framework/test/fuzztest:hdf_framework_fuzztest", ] } -- Gitee