From c8ee7811b3b08ec7264cb4d24081de6d1e2e6fc5 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Tue, 19 Apr 2022 21:08:52 +0800 Subject: [PATCH 1/3] fuzzer test Signed-off-by: wanderer-dl122 --- bundle.json | 15 +++++++++++---- .../test/fuzztest/BUILD.gn | 2 +- .../BUILD.gn | 11 ++++++----- .../accessmanager_fuzzer.cpp} | 2 +- .../accessmanager_fuzzer.h} | 2 +- .../fuzztest/accessmanager_fuzzer/corpus/init | 16 ++++++++++++++++ .../project.xml | 0 .../test/fuzztest/BUILD.gn | 4 ++-- .../BUILD.gn | 11 ++++++----- .../componentmanager_fuzzer.cpp} | 2 +- .../componentmanager_fuzzer.h} | 2 +- .../fuzztest/componentmanager_fuzzer/corpus/init | 16 ++++++++++++++++ .../project.xml | 0 .../BUILD.gn | 11 ++++++----- .../fuzztest/resourcemanager_fuzzer/corpus/init | 16 ++++++++++++++++ .../project.xml | 0 .../resourcemanager_fuzzer.cpp} | 2 +- .../resourcemanager_fuzzer.h} | 2 +- utils/test/fuzztest/BUILD.gn | 2 +- .../{test_utils_fuzzer => utils_fuzzer}/BUILD.gn | 9 +++++---- utils/test/fuzztest/utils_fuzzer/corpus/init | 16 ++++++++++++++++ .../project.xml | 0 .../utils_fuzzer.cpp} | 2 +- .../utils_fuzzer.h} | 2 +- 24 files changed, 110 insertions(+), 35 deletions(-) rename services/distributedhardwarefwkservice/test/fuzztest/{test_accessmanager_fuzzer => accessmanager_fuzzer}/BUILD.gn (85%) rename services/distributedhardwarefwkservice/test/fuzztest/{test_accessmanager_fuzzer/test_accessmanager_fuzzer.cpp => accessmanager_fuzzer/accessmanager_fuzzer.cpp} (97%) rename services/distributedhardwarefwkservice/test/fuzztest/{test_accessmanager_fuzzer/test_accessmanager_fuzzer.h => accessmanager_fuzzer/accessmanager_fuzzer.h} (92%) create mode 100644 services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/corpus/init rename services/distributedhardwarefwkservice/test/fuzztest/{test_accessmanager_fuzzer => accessmanager_fuzzer}/project.xml (100%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_componentmanager_fuzzer => componentmanager_fuzzer}/BUILD.gn (82%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp => componentmanager_fuzzer/componentmanager_fuzzer.cpp} (97%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_componentmanager_fuzzer/test_componentmanager_fuzzer.h => componentmanager_fuzzer/componentmanager_fuzzer.h} (92%) create mode 100644 services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_componentmanager_fuzzer => componentmanager_fuzzer}/project.xml (100%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_resourcemanager_fuzzer => resourcemanager_fuzzer}/BUILD.gn (84%) create mode 100644 services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_resourcemanager_fuzzer => resourcemanager_fuzzer}/project.xml (100%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.cpp => resourcemanager_fuzzer/resourcemanager_fuzzer.cpp} (98%) rename services/distributedhardwarefwkserviceimpl/test/fuzztest/{test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.h => resourcemanager_fuzzer/resourcemanager_fuzzer.h} (92%) rename utils/test/fuzztest/{test_utils_fuzzer => utils_fuzzer}/BUILD.gn (83%) create mode 100644 utils/test/fuzztest/utils_fuzzer/corpus/init rename utils/test/fuzztest/{test_utils_fuzzer => utils_fuzzer}/project.xml (100%) rename utils/test/fuzztest/{test_utils_fuzzer/test_utils_fuzzer.cpp => utils_fuzzer/utils_fuzzer.cpp} (98%) rename utils/test/fuzztest/{test_utils_fuzzer/test_utils_fuzzer.h => utils_fuzzer/utils_fuzzer.h} (93%) diff --git a/bundle.json b/bundle.json index dce07b82..7feb04c1 100644 --- a/bundle.json +++ b/bundle.json @@ -14,9 +14,13 @@ "component": { "name": "distributed_hardware_fwk", "subsystem": "distributedhardware", - "syscap": [ "SystemCapability.distributedhardware.distributed_hardware_fwk" ], + "syscap": [ + "SystemCapability.distributedhardware.distributed_hardware_fwk" + ], "features": [], - "adapted_system_type": [ "standard" ], + "adapted_system_type": [ + "standard" + ], "rom": "128K", "ram": "6M", "deps": { @@ -47,8 +51,11 @@ "test": [ "//foundation/distributedhardware/distributedhardwarefwk/utils/test/unittest:utils_test", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/unittest:test" + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/unittest:test", + "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzzer" ] } } -} +} \ No newline at end of file diff --git a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn index ef3fb4a0..43174dfb 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn @@ -14,5 +14,5 @@ group("fuzztest") { testonly = true - deps = [ "test_accessmanager_fuzzer:fuzztest" ] + deps = [ "accessmanager_fuzzer:fuzztest" ] } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn similarity index 85% rename from services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 23b577d6..02dbbb20 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -18,8 +18,9 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("test_accessmanager_fuzzer") { - module_out_path = "distributed_hardware_fwk/test_accessmanager_fuzzer" +ohos_fuzztest("DhfwkAccessmanagerFuzzer") { + module_out_path = "distributed_hardware_fwk/accessmanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" include_dirs = [ "//utils/native/base/include", @@ -39,7 +40,7 @@ ohos_fuzztest("test_accessmanager_fuzzer") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "test_accessmanager_fuzzer.cpp" ] + sources = [ "accessmanager_fuzzer.cpp" ] deps = [ "${utils_path}:distributedhardwareutils", @@ -50,7 +51,7 @@ ohos_fuzztest("test_accessmanager_fuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"test_accessmanager_fuzzer\"", + "DH_LOG_TAG=\"DhfwkAccessmanagerFuzzer\"", "LOG_DOMAIN=0xD004100", ] @@ -68,6 +69,6 @@ ohos_fuzztest("test_accessmanager_fuzzer") { group("fuzztest") { testonly = true - deps = [ ":test_accessmanager_fuzzer" ] + deps = [ ":DhfwkAccessmanagerFuzzer" ] } ############################################################################### diff --git a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp similarity index 97% rename from services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.cpp rename to services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp index a3cfe4fd..f181c732 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "test_accessmanager_fuzzer.h" +#include "accessmanager_fuzzer.h" #include #include diff --git a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.h b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.h similarity index 92% rename from services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.h rename to services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.h index e1a1e61c..dbbf2403 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/test_accessmanager_fuzzer.h +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/accessmanager_fuzzer.h @@ -16,7 +16,7 @@ #ifndef TEST_ACCESSMANAGER_FUZZER_H #define TEST_ACCESSMANAGER_FUZZER_H -#define FUZZ_PROJECT_NAME "test_accessmanager_fuzzer" +#define FUZZ_PROJECT_NAME "accessmanager_fuzzer" #endif diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/corpus/init b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/corpus/init new file mode 100644 index 00000000..8eb5a7d6 --- /dev/null +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/project.xml b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/project.xml similarity index 100% rename from services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/project.xml rename to services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/project.xml diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn index 55d6ff74..9def5f89 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/BUILD.gn @@ -15,7 +15,7 @@ group("fuzztest") { testonly = true deps = [ - "test_componentmanager_fuzzer:fuzztest", - "test_resourcemanager_fuzzer:fuzztest", + "componentmanager_fuzzer:fuzztest", + "resourcemanager_fuzzer:fuzztest", ] } diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn similarity index 82% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 7bab9f46..54a9ef1a 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -18,8 +18,9 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("test_componentmanager_fuzzer") { - module_out_path = "distributed_hardware_fwk/test_componentmanager_fuzzer" +ohos_fuzztest("DhfwkComponentmanagerFuzzer") { + module_out_path = "distributed_hardware_fwk/componentmanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer" include_dirs = [ "${utils_path}/include", @@ -37,7 +38,7 @@ ohos_fuzztest("test_componentmanager_fuzzer") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "test_componentmanager_fuzzer.cpp" ] + sources = [ "componentmanager_fuzzer.cpp" ] deps = [ "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", @@ -46,7 +47,7 @@ ohos_fuzztest("test_componentmanager_fuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"test_componentmanager_fuzzer\"", + "DH_LOG_TAG=\"DhfwkComponentmanagerFuzzer\"", "LOG_DOMAIN=0xD004100", ] @@ -56,6 +57,6 @@ ohos_fuzztest("test_componentmanager_fuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":test_componentmanager_fuzzer" ] + deps = [ ":DhfwkComponentmanagerFuzzer" ] } ############################################################################### diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp similarity index 97% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp index dabf9a3e..fe2b1d19 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "test_componentmanager_fuzzer.h" +#include "componentmanager_fuzzer.h" #include #include diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.h b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h similarity index 92% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.h rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h index 1914d24d..c69a7db9 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.h +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.h @@ -16,6 +16,6 @@ #ifndef TEST_COMPONENTMANAGER_FUZZER_H #define TEST_COMPONENTMANAGER_FUZZER_H -#define FUZZ_PROJECT_NAME "test_componentmanager_fuzzer" +#define FUZZ_PROJECT_NAME "componentmanager_fuzzer" #endif diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init new file mode 100644 index 00000000..8eb5a7d6 --- /dev/null +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/project.xml b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/project.xml rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/project.xml diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn similarity index 84% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 62620243..a83f6f33 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -18,8 +18,9 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("test_resourcemanager_fuzzer") { - module_out_path = "distributed_hardware_fwk/test_resourcemanager_fuzzer" +ohos_fuzztest("DhfwkresourcemanagerFuzzer") { + module_out_path = "distributed_hardware_fwk/resourcemanager_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer" include_dirs = [ "${utils_path}/include", @@ -41,7 +42,7 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "test_resourcemanager_fuzzer.cpp" ] + sources = [ "resourcemanager_fuzzer.cpp" ] deps = [ "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl", @@ -51,7 +52,7 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"test_resourcemanager_fuzzer\"", + "DH_LOG_TAG=\"DhfwkresourcemanagerFuzzer\"", "LOG_DOMAIN=0xD004100", ] @@ -67,6 +68,6 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":test_resourcemanager_fuzzer" ] + deps = [ ":DhfwkresourcemanagerFuzzer" ] } ############################################################################### diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init new file mode 100644 index 00000000..8eb5a7d6 --- /dev/null +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/project.xml b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml similarity index 100% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/project.xml rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/project.xml diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp similarity index 98% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.cpp rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp index bc901eeb..95b4deb9 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "test_resourcemanager_fuzzer.h" +#include "resourcemanager_fuzzer.h" #include #include diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.h b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h similarity index 92% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.h rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h index 48761b3c..591d5d0c 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/test_resourcemanager_fuzzer.h +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.h @@ -16,6 +16,6 @@ #ifndef TEST_RESOURCEMANAGER_FUZZER_H #define TEST_RESOURCEMANAGER_FUZZER_H -#define FUZZ_PROJECT_NAME "test_resourcemanager_fuzzer" +#define FUZZ_PROJECT_NAME "resourcemanager_fuzzer" #endif diff --git a/utils/test/fuzztest/BUILD.gn b/utils/test/fuzztest/BUILD.gn index d90b4188..9bc256c9 100644 --- a/utils/test/fuzztest/BUILD.gn +++ b/utils/test/fuzztest/BUILD.gn @@ -14,5 +14,5 @@ group("fuzztest") { testonly = true - deps = [ "test_utils_fuzzer:fuzztest" ] + deps = [ "utils_fuzzer:fuzztest" ] } diff --git a/utils/test/fuzztest/test_utils_fuzzer/BUILD.gn b/utils/test/fuzztest/utils_fuzzer/BUILD.gn similarity index 83% rename from utils/test/fuzztest/test_utils_fuzzer/BUILD.gn rename to utils/test/fuzztest/utils_fuzzer/BUILD.gn index c684397a..34458bad 100644 --- a/utils/test/fuzztest/test_utils_fuzzer/BUILD.gn +++ b/utils/test/fuzztest/utils_fuzzer/BUILD.gn @@ -18,8 +18,9 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("test_utils_fuzzer") { - module_out_path = "distributed_hardware_fwk/test_utils_fuzzer" +ohos_fuzztest("DhfwkUtilsFuzzer") { + module_out_path = "distributed_hardware_fwk/utils_fuzzer" + fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest/utils_fuzzer" include_dirs = [ "${utils_path}/include", @@ -33,7 +34,7 @@ ohos_fuzztest("test_utils_fuzzer") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - sources = [ "test_utils_fuzzer.cpp" ] + sources = [ "utils_fuzzer.cpp" ] deps = [ "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils" ] } @@ -41,6 +42,6 @@ ohos_fuzztest("test_utils_fuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":test_utils_fuzzer" ] + deps = [ ":DhfwkUtilsFuzzer" ] } ############################################################################### diff --git a/utils/test/fuzztest/utils_fuzzer/corpus/init b/utils/test/fuzztest/utils_fuzzer/corpus/init new file mode 100644 index 00000000..8eb5a7d6 --- /dev/null +++ b/utils/test/fuzztest/utils_fuzzer/corpus/init @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +FUZZ \ No newline at end of file diff --git a/utils/test/fuzztest/test_utils_fuzzer/project.xml b/utils/test/fuzztest/utils_fuzzer/project.xml similarity index 100% rename from utils/test/fuzztest/test_utils_fuzzer/project.xml rename to utils/test/fuzztest/utils_fuzzer/project.xml diff --git a/utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.cpp b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp similarity index 98% rename from utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.cpp rename to utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp index aa03d3be..f76469e5 100644 --- a/utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.cpp +++ b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "test_utils_fuzzer.h" +#include "utils_fuzzer.h" #include #include diff --git a/utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.h b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.h similarity index 93% rename from utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.h rename to utils/test/fuzztest/utils_fuzzer/utils_fuzzer.h index 7ac240e9..99c304c0 100644 --- a/utils/test/fuzztest/test_utils_fuzzer/test_utils_fuzzer.h +++ b/utils/test/fuzztest/utils_fuzzer/utils_fuzzer.h @@ -16,6 +16,6 @@ #ifndef TEST_UTILS_FUZZER_H #define TEST_UTILS_FUZZER_H -#define FUZZ_PROJECT_NAME "test_utils_fuzzer" +#define FUZZ_PROJECT_NAME "utils_fuzzer" #endif -- Gitee From f7e3dd545dbb4b11f4126f308fda7f00aca939b8 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 5 May 2022 11:09:09 +0800 Subject: [PATCH 2/3] fix fuzztest Signed-off-by: wanderer-dl122 --- bundle.json | 6 +++--- .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index 2bdaeb02..08a4998a 100644 --- a/bundle.json +++ b/bundle.json @@ -54,9 +54,9 @@ "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/unittest:svrimpl_test", "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/unittest:test", "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest", - "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzzer" + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest" ] } } -} \ No newline at end of file +} diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 02dbbb20..c8f94c9a 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -18,7 +18,7 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("DhfwkAccessmanagerFuzzer") { +ohos_fuzztest("DHfwkAccessmanagerFuzzer") { module_out_path = "distributed_hardware_fwk/accessmanager_fuzzer" fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" @@ -51,7 +51,7 @@ ohos_fuzztest("DhfwkAccessmanagerFuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DhfwkAccessmanagerFuzzer\"", + "DH_LOG_TAG=\"DHfwkAccessmanagerFuzzer\"", "LOG_DOMAIN=0xD004100", ] @@ -69,6 +69,6 @@ ohos_fuzztest("DhfwkAccessmanagerFuzzer") { group("fuzztest") { testonly = true - deps = [ ":DhfwkAccessmanagerFuzzer" ] + deps = [ ":DHfwkAccessmanagerFuzzer" ] } ############################################################################### -- Gitee From 9b9fc07feb2de0a2a0e0ae97860bfda2ae7a3717 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Thu, 5 May 2022 20:16:27 +0800 Subject: [PATCH 3/3] fix fuzztest Signed-off-by: wanderer-dl122 --- .../test/fuzztest/accessmanager_fuzzer/BUILD.gn | 8 ++++---- .../test/fuzztest/componentmanager_fuzzer/BUILD.gn | 8 ++++---- .../test/fuzztest/resourcemanager_fuzzer/BUILD.gn | 10 +++++----- .../resourcemanager_fuzzer.cpp | 13 ++++++++----- utils/test/fuzztest/utils_fuzzer/BUILD.gn | 6 +++--- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index c8f94c9a..53d89fa2 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -18,8 +18,8 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("DHfwkAccessmanagerFuzzer") { - module_out_path = "distributed_hardware_fwk/accessmanager_fuzzer" +ohos_fuzztest("AccessmanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/accessmanager" fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer" include_dirs = [ @@ -51,7 +51,7 @@ ohos_fuzztest("DHfwkAccessmanagerFuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DHfwkAccessmanagerFuzzer\"", + "DH_LOG_TAG=\"AccessmanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -69,6 +69,6 @@ ohos_fuzztest("DHfwkAccessmanagerFuzzer") { group("fuzztest") { testonly = true - deps = [ ":DHfwkAccessmanagerFuzzer" ] + deps = [ ":AccessmanagerFuzzTest" ] } ############################################################################### diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 54a9ef1a..5314afb0 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -18,8 +18,8 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("DhfwkComponentmanagerFuzzer") { - module_out_path = "distributed_hardware_fwk/componentmanager_fuzzer" +ohos_fuzztest("ComponentmanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/componentmanager" fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/componentmanager_fuzzer" include_dirs = [ @@ -47,7 +47,7 @@ ohos_fuzztest("DhfwkComponentmanagerFuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DhfwkComponentmanagerFuzzer\"", + "DH_LOG_TAG=\"ComponentmanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -57,6 +57,6 @@ ohos_fuzztest("DhfwkComponentmanagerFuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":DhfwkComponentmanagerFuzzer" ] + deps = [ ":ComponentmanagerFuzzTest" ] } ############################################################################### diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index a83f6f33..4ff5522b 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -18,9 +18,9 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("DhfwkresourcemanagerFuzzer") { - module_out_path = "distributed_hardware_fwk/resourcemanager_fuzzer" - fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer" +ohos_fuzztest("ResourcemanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/resourcemanager" + fuzz_config_file = "${services_path}/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer" include_dirs = [ "${utils_path}/include", @@ -52,7 +52,7 @@ ohos_fuzztest("DhfwkresourcemanagerFuzzer") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"DhfwkresourcemanagerFuzzer\"", + "DH_LOG_TAG=\"ResourcemanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -68,6 +68,6 @@ ohos_fuzztest("DhfwkresourcemanagerFuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":DhfwkresourcemanagerFuzzer" ] + deps = [ ":ResourcemanagerFuzzTest" ] } ############################################################################### diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp index 95b4deb9..c18c31b2 100644 --- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp +++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp @@ -28,10 +28,13 @@ namespace OHOS { namespace DistributedHardware { -constexpr uint16_t DHTYPE_SIZE = 5; -const DHType dhTypeFuzz[DHTYPE_SIZE] = { - DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::BUTTON -}; +namespace { + const uint32_t DH_TYPE_SIZE = 10; + const DHType dhTypeFuzz[DH_TYPE_SIZE] = { + DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC, + DHType::BUTTON, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER + }; +} void ResourceManagerFuzzTest(const uint8_t* data, size_t size) { @@ -43,7 +46,7 @@ void ResourceManagerFuzzTest(const uint8_t* data, size_t size) std::string devId(reinterpret_cast(data), size); std::string devName(reinterpret_cast(data), size); uint16_t devType = *(reinterpret_cast(data)); - DHType dhType = dhTypeFuzz[data[0] % DHTYPE_SIZE]; + DHType dhType = dhTypeFuzz[data[0] % DH_TYPE_SIZE]; std::string dhAttrs(reinterpret_cast(data), size); std::shared_ptr capInfo = diff --git a/utils/test/fuzztest/utils_fuzzer/BUILD.gn b/utils/test/fuzztest/utils_fuzzer/BUILD.gn index 34458bad..89e64ef8 100644 --- a/utils/test/fuzztest/utils_fuzzer/BUILD.gn +++ b/utils/test/fuzztest/utils_fuzzer/BUILD.gn @@ -18,8 +18,8 @@ import( "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni") ##############################fuzztest########################################## -ohos_fuzztest("DhfwkUtilsFuzzer") { - module_out_path = "distributed_hardware_fwk/utils_fuzzer" +ohos_fuzztest("UtilsFuzzTest") { + module_out_path = "distributed_hardware_fwk/utils" fuzz_config_file = "//foundation/distributedhardware/distributedhardwarefwk/utils/test/fuzztest/utils_fuzzer" include_dirs = [ @@ -42,6 +42,6 @@ ohos_fuzztest("DhfwkUtilsFuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":DhfwkUtilsFuzzer" ] + deps = [ ":UtilsFuzzTest" ] } ############################################################################### -- Gitee