Merge pull request #1228 from litghost/handle_jobserver_auth_flag

Handle both jobserver-fds and jobserver-auth flags.
This commit is contained in:
litghost 2020-02-11 08:51:10 -08:00 committed by GitHub
commit d8168d9ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -504,8 +504,9 @@ def run_fuzzer(fuzzer_name, fuzzer_dir, fuzzer_logdir, logger, will_retry):
# Play nice with make's jobserver.
# See https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html#POSIX-Jobserver # noqa
job_fds = []
if '--jobserver-fds' in make_flags:
job_re = re.search('--jobserver-fds=([0-9]+),([0-9]+)', make_flags)
if '--jobserver-fds' in make_flags or '--jobserver-auth' in make_flags:
job_re = re.search(
'--jobserver-(?:fds|auth)=([0-9]+),([0-9]+)', make_flags)
assert job_re, make_flags
job_rd, job_wr = job_re.groups()