From 135382ae123ea3fa7ac47728cff7bedde8944dfa Mon Sep 17 00:00:00 2001 From: yangshuxiang Date: Mon, 18 Dec 2023 07:15:42 +0000 Subject: [PATCH 1/4] fix: add xts test for interface GetWakeupReason Signed-off-by: yangshuxiang --- build.gni | 1 + bundle.json | 3 ++- powermgr/power/hdi_power/BUILD.gn | 6 ++++++ .../power/hdi_power/common/hdi_power_test.cpp | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/build.gni b/build.gni index 28b86133..8fb442b8 100644 --- a/build.gni +++ b/build.gni @@ -14,4 +14,5 @@ import("//build/ohos.gni") declare_args() { hats_rich = false hats_nnrt = false + drivers_peripheral_power_wakeup_cause_path = false } diff --git a/bundle.json b/bundle.json index c7252b1b..24ac7727 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,8 @@ "syscap": [], "features": [ "hats_rich", - "hats_nnrt" + "hats_nnrt", + "drivers_peripheral_power_wakeup_cause_path" ], "adapted_system_type": [ "mini", diff --git a/powermgr/power/hdi_power/BUILD.gn b/powermgr/power/hdi_power/BUILD.gn index 0d4c0513..7330329f 100755 --- a/powermgr/power/hdi_power/BUILD.gn +++ b/powermgr/power/hdi_power/BUILD.gn @@ -14,6 +14,7 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") import("//test/xts/tools/build/suite.gni") +import("//test/xts/hats/build.gni") ohos_moduletest_suite("HatsPowermgrPowerTest") { module_out_path = "powermgr/power" @@ -29,6 +30,11 @@ ohos_moduletest_suite("HatsPowermgrPowerTest") { "hilog:libhilog", "ipc:ipc_single", ] + + if (drivers_peripheral_power_wakeup_cause_path) { + defines = [ "DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH" ] + } + subsystem_name = "xts" part_name = "hats" } diff --git a/powermgr/power/hdi_power/common/hdi_power_test.cpp b/powermgr/power/hdi_power/common/hdi_power_test.cpp index 5146fd17..932a896d 100644 --- a/powermgr/power/hdi_power/common/hdi_power_test.cpp +++ b/powermgr/power/hdi_power/common/hdi_power_test.cpp @@ -641,4 +641,20 @@ HWTEST_F(HdfPowerHdiTest, HdfPowerHdiTest037, TestSize.Level3) EXPECT_TRUE(OHOS::HDI::Power::V1_1::RunningLockType::RUNNINGLOCK_BUTT == 66); printf("HdfPowerHdiTest037: end."); } + +/** + * @tc.name: HdfPowerHdiTest038 + * @tc.desc: check GetWakeupReason + * @tc.type: FUNC + */ +HWTEST_F(HdfPowerHdiTest, HdfPowerHdiTest038, TestSize.Level1) +{ + std::string testName = "HdfPowerHdiTest038"; + int32_t ret = g_powerInterface->GetWakeupReason(testName); +#ifdef DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH + EXPECT_EQ(0, ret); +#else + EXPECT_NE(0, ret); +#endif +} } From 2c00c9a39030ebb32ba6d9c67b8280819e5b2ad0 Mon Sep 17 00:00:00 2001 From: yangshuxiang Date: Mon, 18 Dec 2023 12:29:22 +0000 Subject: [PATCH 2/4] fix: modify code Signed-off-by: yangshuxiang --- build.gni | 1 - bundle.json | 3 +-- powermgr/power/hdi_power/BUILD.gn | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gni b/build.gni index 8fb442b8..28b86133 100644 --- a/build.gni +++ b/build.gni @@ -14,5 +14,4 @@ import("//build/ohos.gni") declare_args() { hats_rich = false hats_nnrt = false - drivers_peripheral_power_wakeup_cause_path = false } diff --git a/bundle.json b/bundle.json index 24ac7727..c7252b1b 100644 --- a/bundle.json +++ b/bundle.json @@ -15,8 +15,7 @@ "syscap": [], "features": [ "hats_rich", - "hats_nnrt", - "drivers_peripheral_power_wakeup_cause_path" + "hats_nnrt" ], "adapted_system_type": [ "mini", diff --git a/powermgr/power/hdi_power/BUILD.gn b/powermgr/power/hdi_power/BUILD.gn index 7330329f..a8b75616 100755 --- a/powermgr/power/hdi_power/BUILD.gn +++ b/powermgr/power/hdi_power/BUILD.gn @@ -13,8 +13,8 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") +import("//drivers/peripheral/power/power.gni") import("//test/xts/tools/build/suite.gni") -import("//test/xts/hats/build.gni") ohos_moduletest_suite("HatsPowermgrPowerTest") { module_out_path = "powermgr/power" From 9724d0cfc241e469b57552aeb037b25ee824c5ff Mon Sep 17 00:00:00 2001 From: yangshuxiang Date: Tue, 19 Dec 2023 03:10:26 +0000 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=80=A7?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangshuxiang --- build.gni | 1 + bundle.json | 3 ++- powermgr/power/hdi_power/BUILD.gn | 6 +++--- powermgr/power/hdi_power/common/hdi_power_test.cpp | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gni b/build.gni index 28b86133..4c8d29bc 100644 --- a/build.gni +++ b/build.gni @@ -14,4 +14,5 @@ import("//build/ohos.gni") declare_args() { hats_rich = false hats_nnrt = false + hats_drivers_peripheral_power_wakeup_cause_path = false } diff --git a/bundle.json b/bundle.json index c7252b1b..d277a744 100644 --- a/bundle.json +++ b/bundle.json @@ -15,7 +15,8 @@ "syscap": [], "features": [ "hats_rich", - "hats_nnrt" + "hats_nnrt", + "hats_drivers_peripheral_power_wakeup_cause_path" ], "adapted_system_type": [ "mini", diff --git a/powermgr/power/hdi_power/BUILD.gn b/powermgr/power/hdi_power/BUILD.gn index a8b75616..19fabbeb 100755 --- a/powermgr/power/hdi_power/BUILD.gn +++ b/powermgr/power/hdi_power/BUILD.gn @@ -13,8 +13,8 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") -import("//drivers/peripheral/power/power.gni") import("//test/xts/tools/build/suite.gni") +import("//test/xts/hats/build.gni") ohos_moduletest_suite("HatsPowermgrPowerTest") { module_out_path = "powermgr/power" @@ -31,8 +31,8 @@ ohos_moduletest_suite("HatsPowermgrPowerTest") { "ipc:ipc_single", ] - if (drivers_peripheral_power_wakeup_cause_path) { - defines = [ "DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH" ] + if (hats_drivers_peripheral_power_wakeup_cause_path) { + defines = [ "HATS_DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH" ] } subsystem_name = "xts" diff --git a/powermgr/power/hdi_power/common/hdi_power_test.cpp b/powermgr/power/hdi_power/common/hdi_power_test.cpp index 932a896d..4b1687a4 100644 --- a/powermgr/power/hdi_power/common/hdi_power_test.cpp +++ b/powermgr/power/hdi_power/common/hdi_power_test.cpp @@ -651,7 +651,7 @@ HWTEST_F(HdfPowerHdiTest, HdfPowerHdiTest038, TestSize.Level1) { std::string testName = "HdfPowerHdiTest038"; int32_t ret = g_powerInterface->GetWakeupReason(testName); -#ifdef DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH +#ifdef HATS_DRIVER_PERIPHERAL_POWER_WAKEUP_CAUSE_PATH EXPECT_EQ(0, ret); #else EXPECT_NE(0, ret); From bdf16ffc7aafe4859c5f1ebd654125c600452fd8 Mon Sep 17 00:00:00 2001 From: yangshuxiang Date: Tue, 19 Dec 2023 07:03:50 +0000 Subject: [PATCH 4/4] fix: modify gn file format Signed-off-by: yangshuxiang --- powermgr/power/hdi_power/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powermgr/power/hdi_power/BUILD.gn b/powermgr/power/hdi_power/BUILD.gn index 19fabbeb..e6c79020 100755 --- a/powermgr/power/hdi_power/BUILD.gn +++ b/powermgr/power/hdi_power/BUILD.gn @@ -13,8 +13,8 @@ import("//build/ohos_var.gni") import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni") -import("//test/xts/tools/build/suite.gni") import("//test/xts/hats/build.gni") +import("//test/xts/tools/build/suite.gni") ohos_moduletest_suite("HatsPowermgrPowerTest") { module_out_path = "powermgr/power"