From def18ebc81af84a15446a7b55759e7b6cd81f7ab Mon Sep 17 00:00:00 2001 From: yanghang Date: Mon, 4 Nov 2024 10:46:09 +0800 Subject: [PATCH] fix: Repair the fuzz coverage Signed-off-by: yanghang --- state_manager/service/BUILD.gn | 4 ++++ .../service/native/src/display_power_mgr_service.cpp | 2 ++ state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn | 5 +++++ .../test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn | 5 +++++ .../test/fuzztest/discountbrightness_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn | 5 +++++ .../test/fuzztest/overridebrightness_fuzzer/BUILD.gn | 5 +++++ .../test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn | 5 +++++ .../fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn | 5 +++++ state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn | 5 +++++ 16 files changed, 76 insertions(+) diff --git a/state_manager/service/BUILD.gn b/state_manager/service/BUILD.gn index ba546cc..b2e1033 100644 --- a/state_manager/service/BUILD.gn +++ b/state_manager/service/BUILD.gn @@ -82,6 +82,7 @@ ohos_shared_library("displaymgrservice") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] @@ -89,6 +90,9 @@ ohos_shared_library("displaymgrservice") { if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } shlib_type = "sa" subsystem_name = "powermgr" part_name = "${displaymgr_part_name}" diff --git a/state_manager/service/native/src/display_power_mgr_service.cpp b/state_manager/service/native/src/display_power_mgr_service.cpp index dae2b3c..f4c016c 100644 --- a/state_manager/service/native/src/display_power_mgr_service.cpp +++ b/state_manager/service/native/src/display_power_mgr_service.cpp @@ -75,7 +75,9 @@ void DisplayPowerMgrService::Init() DISPLAY_HILOGE(COMP_SVC, "cannot find any display id after max retry, fill with 0"); } } +#ifndef FUZZ_COV_TEST BrightnessManager::Get().Init(BRIGHTNESS_MAX, BRIGHTNESS_MIN); +#endif for (const auto& id: displayIds) { DISPLAY_HILOGI(COMP_SVC, "find display, id=%{public}u", id); controllerMap_.emplace(id, std::make_shared(id)); diff --git a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn index d7e1f32..655f0b7 100644 --- a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn index 43d7b35..3a46847 100644 --- a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn index d2e70ae..2475800 100644 --- a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn index 0bc6a68..18f926a 100644 --- a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn index 44ca3ff..1c72d84 100644 --- a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn @@ -78,10 +78,15 @@ ohos_fuzztest("DisplayStateFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn index 97b8db4..4a97ecf 100644 --- a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn index 8c9ec51..f17bd67 100644 --- a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn @@ -78,10 +78,15 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn index 046d76f..4d6b767 100644 --- a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn index 5c561a6..e069cde 100644 --- a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn index 24b9ddd..c2e7fb8 100644 --- a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn index 7caaf27..d7273e1 100644 --- a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn index 1e57a59..963d956 100644 --- a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn index c87dfce..4200b33 100644 --- a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } diff --git a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn index 164063c..a4a735e 100644 --- a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn @@ -79,10 +79,15 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "window_manager:libdm_lite", ] + defines = [] if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] + defines += [ "ENABLE_SENSOR_PART" ] } if (has_hiviewdfx_hisysevent_part) { external_deps += [ "hisysevent:libhisysevent" ] } + if (use_clang_coverage) { + defines += [ "FUZZ_COV_TEST" ] + } } -- Gitee