thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-15 12:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorganize command line, add CI.FUZZER_ARGS option

Browse Source
This commit is contained in:
Yakov Olkhovskiy 2024-10-23 14:36:27 +00:00
parent 32be533290
commit b958dcb50f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/fuzz/clickhouse_fuzzer.options Normal file
View File

@ -0,0 +1,2 @@
[CI]
FUZZER_ARGS = true

24
tests/fuzz/runner.py
View File

@ -44,6 +44,7 @@ def run_fuzzer(fuzzer: str, timeout: int):
options_file = f"{fuzzer}.options"
custom_libfuzzer_options = ""
fuzzer_arguments = ""
use_fuzzer_args = False
with Path(options_file) as path:
if path.exists() and path.is_file():
@ -78,24 +79,28 @@ def run_fuzzer(fuzzer: str, timeout: int):
for key, value in parser["fuzzer_arguments"].items()
)
use_fuzzer_args = parser.getboolean("CI", "FUZZER_ARGS", fallback=False)
exact_artifact_path = f"{OUTPUT}/{fuzzer}.unit"
status_path = f"{OUTPUT}/{fuzzer}.status"
out_path = f"{OUTPUT}/{fuzzer}.out"
stdout_path = f"{OUTPUT}/{fuzzer}.stdout"
cmd_line = f"{DEBUGGER} ./{fuzzer} {active_corpus_dir} {seed_corpus_dir}"
if not "-dict=" in custom_libfuzzer_options and Path(f"{fuzzer}.dict").exists():
custom_libfuzzer_options += f" -dict={fuzzer}.dict"
custom_libfuzzer_options += f" -exact_artifact_path={exact_artifact_path}"
cmd_line += f" -exact_artifact_path={exact_artifact_path}"
libfuzzer_corpora = f"{active_corpus_dir} {seed_corpus_dir}"
if custom_libfuzzer_options:
cmd_line += f" {custom_libfuzzer_options}"
if fuzzer_arguments:
cmd_line += f" {fuzzer_arguments}"
cmd_line = f"{DEBUGGER} ./{fuzzer} {fuzzer_arguments}"
if not "-dict=" in cmd_line and Path(f"{fuzzer}.dict").exists():
cmd_line += f" -dict={fuzzer}.dict"
env = None
if use_fuzzer_args:
env = {"FUZZER_ARGS": f"{custom_libfuzzer_options} {libfuzzer_corpora}"}
else:
cmd_line += f" {custom_libfuzzer_options} {libfuzzer_corpora}"
logging.info("...will execute: %s", cmd_line)
logging.info("...will execute: %s%s", cmd_line, f" with FUZZER_ARGS {env["FUZZER_ARGS"]}" if use_fuzzer_args else "")
stopwatch = Stopwatch()
try:
@ -110,6 +115,7 @@ def run_fuzzer(fuzzer: str, timeout: int):
shell=False,
errors="replace",
timeout=timeout,
env=env,
)
except subprocess.CalledProcessError:
logging.info("Fail running %s", fuzzer)