diff --git a/bundle.json b/bundle.json index 39000b9189c71b40803aea3b4146f4e6cfa95ebe..08a4998a1a5678e99eb901e556abe408711510b0 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": { @@ -48,7 +52,10 @@ "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/distributedhardwarefwkserviceimpl/test/fuzztest:fuzztest", + "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice/test/fuzztest:fuzztest" ] } } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/BUILD.gn index ef3fb4a00118bb31f856ed872dda17a00a23d637..43174dfbc1fe80d25ea5c632d7dd04eba685638d 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 86% rename from services/distributedhardwarefwkservice/test/fuzztest/test_accessmanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 23b577d6a5d705d06f24883c66ff00f98f05c2c8..53d89fa2be3427cf19f47b64120e02fbd5a7307c 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("AccessmanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/accessmanager" + 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=\"AccessmanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -68,6 +69,6 @@ ohos_fuzztest("test_accessmanager_fuzzer") { group("fuzztest") { testonly = true - deps = [ ":test_accessmanager_fuzzer" ] + deps = [ ":AccessmanagerFuzzTest" ] } ############################################################################### 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 a3cfe4fdf4b325fac6295e63a7ebf460907f4373..f181c732048ced38649b248d4643eeae9cd6bc71 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 e1a1e61c873cdb774583babec8ec8d5716f66fe8..dbbf2403121dccb375425db8c5eafb7ffa87f29a 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 0000000000000000000000000000000000000000..8eb5a7d6eb6b7d71f0c70c244e5768d62bee6ac5 --- /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 55d6ff748c8f69b65d5152d764594749efa0aae3..9def5f890e2a38d002aa72ae62a98b00cffbed9a 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 7bab9f46029b05265c7ff263447819f1e4b66f78..5314afb0ab2759af07bfbe51a3ce8b1108e48f89 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("ComponentmanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/componentmanager" + 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=\"ComponentmanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -56,6 +57,6 @@ ohos_fuzztest("test_componentmanager_fuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":test_componentmanager_fuzzer" ] + deps = [ ":ComponentmanagerFuzzTest" ] } ############################################################################### 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 bcb5bfed9f80ac7934287c66c302675b1e8736f0..4ed6b27b8bdf8dbd3aff2d99ce792d5f6b8777d7 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 1914d24d443de16da735a138bbd16e291e02829c..c69a7db9769f3a9e8a2e7967a0fd54e4fce2a041 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 0000000000000000000000000000000000000000..8eb5a7d6eb6b7d71f0c70c244e5768d62bee6ac5 --- /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 86% rename from services/distributedhardwarefwkserviceimpl/test/fuzztest/test_resourcemanager_fuzzer/BUILD.gn rename to services/distributedhardwarefwkserviceimpl/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index 62620243a5198407deee981cb47d357915c47be8..4ff5522b561767791272ad747e6b4f4c98bba0c2 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("ResourcemanagerFuzzTest") { + module_out_path = "distributed_hardware_fwk/resourcemanager" + fuzz_config_file = "${services_path}/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=\"ResourcemanagerFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -67,6 +68,6 @@ ohos_fuzztest("test_resourcemanager_fuzzer") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":test_resourcemanager_fuzzer" ] + deps = [ ":ResourcemanagerFuzzTest" ] } ############################################################################### 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 0000000000000000000000000000000000000000..8eb5a7d6eb6b7d71f0c70c244e5768d62bee6ac5 --- /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 86% 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 bc901eeb07c85c59af8f19b450d84965b88f42b1..c18c31b2f1dc767e3895738d688b51ce3adc2113 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 @@ -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/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 48761b3c15347704976944ef0fb8603d0368f6c1..591d5d0cc6df41b6898dea687b4d37b369a86e86 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 d90b4188259bed25c651edfb4455c78435831ef7..9bc256c9edb7f67346f2429900298c858daa30ec 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 84% rename from utils/test/fuzztest/test_utils_fuzzer/BUILD.gn rename to utils/test/fuzztest/utils_fuzzer/BUILD.gn index c684397aa12b55bb06695d80b62320051a7022c2..89e64ef8c417041a85a32be9c1e5a0fa762ae3c0 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("UtilsFuzzTest") { + module_out_path = "distributed_hardware_fwk/utils" + 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 = [ ":UtilsFuzzTest" ] } ############################################################################### diff --git a/utils/test/fuzztest/utils_fuzzer/corpus/init b/utils/test/fuzztest/utils_fuzzer/corpus/init new file mode 100644 index 0000000000000000000000000000000000000000..8eb5a7d6eb6b7d71f0c70c244e5768d62bee6ac5 --- /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 aa03d3be0919f6eab213dfa889974da04b4ac627..f76469e508b5b15525a714329150fcde1535575e 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 7ac240e99fb6526f6a5acc653e6607a4155ca9b5..99c304c01b8e5c0bcd36e759b323ccdacab0783e 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