[infra] Add parens to ensure correct execution order (#3104). (#3213)

This commit is contained in:
Max Moroz 2020-01-09 10:34:08 -08:00 committed by GitHub
parent cfe13cb116
commit 12b5811ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -176,14 +176,14 @@ def get_build_steps(project_dir):
'args': [
'bash',
'-c',
('for f in /corpus/*.zip; do unzip -q $f -d ${f%%.*} || '
('for f in /corpus/*.zip; do unzip -q $f -d ${f%%.*} || ('
'echo "Failed to unpack the corpus for $(basename ${f%%.*}). '
'This usually means that corpus backup for a particular fuzz '
'target does not exist. If a fuzz target was added in the last '
'24 hours, please wait one more day. Otherwise, something is '
'wrong with the fuzz target or the infrastructure, and corpus '
'pruning task does not finish successfully." && exit 1; '
'done && coverage')
'pruning task does not finish successfully." && exit 1'
'); done && coverage')
],
'volumes': [{'name': 'corpus', 'path': '/corpus'}],
}

View File

@ -254,7 +254,7 @@ def get_build_steps(project_dir):
# the Dockerfile). Container Builder overrides our workdir
# so we need to add this step to set it back.
('rm -r /out && cd /src && cd {1} && mkdir -p {0} && '
'compile || echo "build_fuzzers {2}" && false')
'compile || (echo "build_fuzzers {2}" && false)')
.format(out, workdir, failure_msg),
],
})
@ -282,7 +282,7 @@ def get_build_steps(project_dir):
'args': [
'bash',
'-c',
'test_all || echo "check_build {0}" && false'.format(
'test_all || (echo "check_build {0}" && false)'.format(
failure_msg)
],
})