From d0cd57e6b57ceab69b324725b59df74a296e05c8 Mon Sep 17 00:00:00 2001 From: renxiang Date: Thu, 29 Jul 2021 15:40:10 +0800 Subject: [PATCH 1/4] adapt fuzz test framework Signed-off-by: renxiang --- libs/fuzzlib/fuzzer_helper.py | 2 +- libs/fuzzlib/tools/templates.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/fuzzlib/fuzzer_helper.py b/libs/fuzzlib/fuzzer_helper.py index b7d4ee7..f722639 100644 --- a/libs/fuzzlib/fuzzer_helper.py +++ b/libs/fuzzlib/fuzzer_helper.py @@ -132,7 +132,7 @@ def generate(args): with open(file_path, 'w') as filehandle: filehandle.write(PROJECT_XML_TEMPLATE % template_args) - file_path = os.path.join(project_dir_path, "%s.cc" % args.project_name) + file_path = os.path.join(project_dir_path, "%s.cpp" % args.project_name) with open(file_path, 'w') as filehandle: filehandle.write(PROJECT_DEMO_TEMPLATE % template_args) diff --git a/libs/fuzzlib/tools/templates.py b/libs/fuzzlib/tools/templates.py index 936183a..deb5675 100644 --- a/libs/fuzzlib/tools/templates.py +++ b/libs/fuzzlib/tools/templates.py @@ -94,11 +94,11 @@ PROJECT_DEMO_TEMPLATE = """\ #include #include -const int FUZZ_DATA_LEN = 3 -const int FUZZ_FST_DATA = 0 -const int FUZZ_SND_DATA = 1 -const int FUZZ_TRD_DATA = 2 -const int FUZZ_FTH_DATA = 3 +const int FUZZ_DATA_LEN = 3; +const int FUZZ_FST_DATA = 0; +const int FUZZ_SND_DATA = 1; +const int FUZZ_TRD_DATA = 2; +const int FUZZ_FTH_DATA = 3; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) -- Gitee From b26fe86a6b309921520223c4df1604be9af00fe6 Mon Sep 17 00:00:00 2001 From: NicoYam Date: Thu, 29 Jul 2021 13:24:22 +0000 Subject: [PATCH 2/4] adapt fuzz test in windows --- src/core/utils.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/core/utils.py b/src/core/utils.py index 752781b..03d3b36 100755 --- a/src/core/utils.py +++ b/src/core/utils.py @@ -18,6 +18,7 @@ import sys import os +import platform import time from core.config.config_manager import UserConfigManager @@ -156,13 +157,18 @@ def get_decode(stream): def parse_fuzzer_info(): path_list = [] bin_list = [] - list_path = os.path.join(sys.source_code_root_path, "test", - "developertest", "libs", "fuzzlib", "fuzzer_list.txt") + list_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname( + os.path.realpath(__file__)))), "libs", "fuzzlib", "fuzzer_list.txt") with open(list_path, 'r') as list_file: for line in list_file.readlines(): striped_str = line.strip() - path_list.append(striped_str.split(":")[0][3:]) - bin_list.append(striped_str.split(":")[1].split("(")[0]) + if platform.system() == "Windows": + path_list.append(striped_str.split(":")[0][3:] + ":" + + striped_str.split(":")[1].split("(")[0]) + bin_list.append(striped_str.split(":")[2].split("(")[0]) + else: + path_list.append(striped_str.split(":")[0][3:]) + bin_list.append(striped_str.split(":")[1].split("(")[0]) return path_list, bin_list def get_fuzzer_path(filename): -- Gitee From 01b32d34babd53d37ac4e62e1acee6489f7d8ed1 Mon Sep 17 00:00:00 2001 From: NicoYam Date: Fri, 30 Jul 2021 02:24:23 +0000 Subject: [PATCH 3/4] adapt fuzz test in windows --- src/core/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/utils.py b/src/core/utils.py index 03d3b36..02f086f 100755 --- a/src/core/utils.py +++ b/src/core/utils.py @@ -163,9 +163,8 @@ def parse_fuzzer_info(): for line in list_file.readlines(): striped_str = line.strip() if platform.system() == "Windows": - path_list.append(striped_str.split(":")[0][3:] + ":" + - striped_str.split(":")[1].split("(")[0]) - bin_list.append(striped_str.split(":")[2].split("(")[0]) + path_list.append(striped_str.split(" ")[0]) + bin_list.append(striped_str.split(" ")[1]) else: path_list.append(striped_str.split(":")[0][3:]) bin_list.append(striped_str.split(":")[1].split("(")[0]) -- Gitee From 53a712d4e5d75086cb0def042b336b758fb0ca80 Mon Sep 17 00:00:00 2001 From: NicoYam Date: Fri, 30 Jul 2021 08:25:55 +0000 Subject: [PATCH 4/4] adapt fuzz test framework --- libs/fuzzlib/fuzzer_helper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/fuzzlib/fuzzer_helper.py b/libs/fuzzlib/fuzzer_helper.py index f722639..7bfb2f4 100644 --- a/libs/fuzzlib/fuzzer_helper.py +++ b/libs/fuzzlib/fuzzer_helper.py @@ -162,7 +162,6 @@ def make(args, stdout=None): './build.sh', '--gn-args', 'build_example=true', - '--target-variant sanitizer', '--build-target' ] build_script.append(args.project_name) -- Gitee