Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[helper] Use base-runner to check if fuzzer exists. (#6453) 

Fixes: https://github.com/google/oss-fuzz/issues/6452
This commit is contained in:
jonathanmetzman 2021-09-15 13:29:52 -07:00 committed by GitHub
parent dab5a9945b
commit c66a9d2b53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infra/helper.py
View File

@ -35,6 +35,8 @@ import constants
OSS_FUZZ_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
BUILD_DIR = os.path.join(OSS_FUZZ_DIR, 'build')
BASE_RUNNER_IMAGE = 'gcr.io/oss-fuzz-base/base-runner'
BASE_IMAGES = [
'gcr.io/oss-fuzz-base/base-image',
'gcr.io/oss-fuzz-base/base-clang',
@ -44,7 +46,7 @@ BASE_IMAGES = [
'gcr.io/oss-fuzz-base/base-builder-python',
'gcr.io/oss-fuzz-base/base-builder-rust',
'gcr.io/oss-fuzz-base/base-builder-swift',
'gcr.io/oss-fuzz-base/base-runner',
BASE_RUNNER_IMAGE,
'gcr.io/oss-fuzz-base/base-runner-debug',
]
@ -377,7 +379,7 @@ def _check_fuzzer_exists(project, fuzzer_name):
"""Checks if a fuzzer exists."""
command = ['docker', 'run', '--rm']
command.extend(['-v', '%s:/out' % project.out])
command.append('ubuntu:16.04')
command.append(BASE_RUNNER_IMAGE)
command.extend(['/bin/bash', '-c', 'test -f /out/%s' % fuzzer_name])
@ -714,8 +716,7 @@ def check_build(args):
env += args.e
run_args = _env_to_docker_args(env) + [
'-v',
'%s:/out' % args.project.out, '-t', 'gcr.io/oss-fuzz-base/base-runner'
'-v', '%s:/out' % args.project.out, '-t', BASE_RUNNER_IMAGE
]
if args.fuzzer_name:
@ -880,7 +881,7 @@ def coverage(args):
'-v',
'%s:/out' % args.project.out,
'-t',
'gcr.io/oss-fuzz-base/base-runner',
BASE_RUNNER_IMAGE,
])
run_args.append('coverage')
@ -930,7 +931,7 @@ def run_fuzzer(args):
'-v',
'%s:/out' % args.project.out,
'-t',
'gcr.io/oss-fuzz-base/base-runner',
BASE_RUNNER_IMAGE,
'run_fuzzer',
args.fuzzer_name,
] + args.fuzzer_args)