From 2678e7a3a7c2f9d9f77c6304ca6f43c94bcf6940 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Mon, 10 Feb 2020 13:38:01 -0800 Subject: [PATCH] Handle both jobserver-fds and jobserver-auth flags. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- fuzzers/run_fuzzer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fuzzers/run_fuzzer.py b/fuzzers/run_fuzzer.py index e65bb0ca..aedc253d 100755 --- a/fuzzers/run_fuzzer.py +++ b/fuzzers/run_fuzzer.py @@ -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()