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

Revert "[infra] Remove srcmap related commands from gcb script (follow-up #1839)." (#1848) 

This reverts commit f132eaf19c.
This commit is contained in:
Abhishek Arya 2018-10-01 22:34:05 -07:00 committed by GitHub
parent 730451d871
commit 4afcfab869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
infra/gcb/build_project.py
View File

@ -166,6 +166,15 @@ def get_build_steps(project_dir):
], ],
'dir': 'oss-fuzz/projects/' + name, 'dir': 'oss-fuzz/projects/' + name,
}, },
{
'name':
image,
'args': [
'bash', '-c',
'srcmap > /workspace/srcmap.json && cat /workspace/srcmap.json'
],
'env': ['OSSFUZZ_REVISION=$REVISION_ID'],
},
{ {
'name': 'gcr.io/oss-fuzz-base/msan-builder', 'name': 'gcr.io/oss-fuzz-base/msan-builder',
'args': [ 'args': [
@ -186,9 +195,12 @@ def get_build_steps(project_dir):
out = '/workspace/out/' + sanitizer out = '/workspace/out/' + sanitizer
stamped_name = name + '-' + sanitizer + '-' + ts stamped_name = name + '-' + sanitizer + '-' + ts
zip_file = stamped_name + '.zip' zip_file = stamped_name + '.zip'
stamped_srcmap_file = stamped_name + '.srcmap.json'
bucket = ENGINE_INFO[fuzzing_engine].upload_bucket bucket = ENGINE_INFO[fuzzing_engine].upload_bucket
upload_url = get_signed_url(UPLOAD_URL_FORMAT.format(bucket, name, upload_url = get_signed_url(UPLOAD_URL_FORMAT.format(bucket, name,
zip_file)) zip_file))
srcmap_url = get_signed_url(UPLOAD_URL_FORMAT.format(bucket, name,
stamped_srcmap_file))
targets_list_filename = get_targets_list_filename(sanitizer) targets_list_filename = get_targets_list_filename(sanitizer)
targets_list_url = get_signed_url( targets_list_url = get_signed_url(
get_targets_list_url(bucket, name, sanitizer)) get_targets_list_url(bucket, name, sanitizer))
@ -263,6 +275,14 @@ def get_build_steps(project_dir):
'bash', '-c', 'cd {0} && zip -r {1} *'.format(out, zip_file) 'bash', '-c', 'cd {0} && zip -r {1} *'.format(out, zip_file)
], ],
}, },
# upload srcmap
{
'name': 'gcr.io/oss-fuzz-base/uploader',
'args': [
'/workspace/srcmap.json',
srcmap_url,
],
},
# upload binaries # upload binaries
{ {
'name': 'gcr.io/oss-fuzz-base/uploader', 'name': 'gcr.io/oss-fuzz-base/uploader',