mirror of https://github.com/google/oss-fuzz.git
parent
70dd8b4c95
commit
54e2b96603
|
@ -130,8 +130,6 @@ def get_build_steps( # pylint: disable=too-many-locals, too-many-arguments
|
|||
'HTTP_PORT=',
|
||||
f'COVERAGE_EXTRA_ARGS={project.coverage_extra_args.strip()}',
|
||||
]
|
||||
if 'dataflow' in project.fuzzing_engines:
|
||||
coverage_env.append('FULL_SUMMARY_PER_TARGET=1')
|
||||
|
||||
build_steps.append({
|
||||
'name':
|
||||
|
|
|
@ -64,10 +64,6 @@ ENGINE_INFO = {
|
|||
EngineInfo(upload_bucket='clusterfuzz-builds-honggfuzz',
|
||||
supported_sanitizers=['address'],
|
||||
supported_architectures=['x86_64']),
|
||||
'dataflow':
|
||||
EngineInfo(upload_bucket='clusterfuzz-builds-dataflow',
|
||||
supported_sanitizers=['dataflow'],
|
||||
supported_architectures=['x86_64']),
|
||||
'none':
|
||||
EngineInfo(upload_bucket='clusterfuzz-builds-no-engine',
|
||||
supported_sanitizers=['address'],
|
||||
|
|
|
@ -331,15 +331,6 @@ def get_build_steps( # pylint: disable=too-many-locals, too-many-statements, to
|
|||
],
|
||||
})
|
||||
|
||||
if build.sanitizer == 'dataflow' and build.fuzzing_engine == 'dataflow':
|
||||
dataflow_steps = dataflow_post_build_steps(project.name, env,
|
||||
base_images_project,
|
||||
config.test_image_suffix)
|
||||
if dataflow_steps:
|
||||
build_steps.extend(dataflow_steps)
|
||||
else:
|
||||
sys.stderr.write('Skipping dataflow post build steps.\n')
|
||||
|
||||
build_steps.extend([
|
||||
# Generate targets list.
|
||||
{
|
||||
|
@ -457,36 +448,6 @@ def get_runner_image_name(base_images_project, test_image_suffix):
|
|||
return image
|
||||
|
||||
|
||||
def dataflow_post_build_steps(project_name, env, base_images_project,
|
||||
test_image_suffix):
|
||||
"""Appends dataflow post build steps."""
|
||||
steps = build_lib.download_corpora_steps(project_name)
|
||||
if not steps:
|
||||
return None
|
||||
|
||||
steps.append({
|
||||
'name':
|
||||
get_runner_image_name(base_images_project, test_image_suffix),
|
||||
'env':
|
||||
env + [
|
||||
'COLLECT_DFT_TIMEOUT=2h',
|
||||
'DFT_FILE_SIZE_LIMIT=65535',
|
||||
'DFT_MIN_TIMEOUT=2.0',
|
||||
'DFT_TIMEOUT_RANGE=6.0',
|
||||
],
|
||||
'args': [
|
||||
'bash', '-c',
|
||||
('for f in /corpus/*.zip; do unzip -q $f -d ${f%%.*}; done && '
|
||||
'collect_dft || (echo "DFT collection failed." && false)')
|
||||
],
|
||||
'volumes': [{
|
||||
'name': 'corpus',
|
||||
'path': '/corpus'
|
||||
}],
|
||||
})
|
||||
return steps
|
||||
|
||||
|
||||
# pylint: disable=no-member,too-many-arguments
|
||||
def run_build(oss_fuzz_project,
|
||||
build_steps,
|
||||
|
|
Loading…
Reference in New Issue