Skip to content

Commit 60ac40d

Browse files
infra: Fix reproduce not outputting Docker logs (#14299)
It seems that, at some point (*), `infra/helper.py reproduce` stopped outputting the Docker logs, even when the reproducer triggers an assertion. (*) Probably because of some of the changes in #14145 Co-authored-by: DavidKorczynski <[email protected]>
1 parent ecddcea commit 60ac40d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

infra/helper.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def prepare_aarch64_emulation():
795795
subprocess.check_call(['docker', 'buildx', 'use', ARM_BUILDER_NAME])
796796

797797

798-
def docker_run(run_args, print_output=True, architecture='x86_64'):
798+
def docker_run(run_args, *, print_output=True, architecture='x86_64'):
799799
"""Calls `docker run`."""
800800
platform = 'linux/arm64' if architecture == 'aarch64' else 'linux/amd64'
801801
command = [
@@ -1612,7 +1612,7 @@ def fuzzbench_measure(args):
16121612
f'gcr.io/oss-fuzz/{args.project.name}', 'fuzzbench_measure'
16131613
]
16141614

1615-
return docker_run(run_args, 'x86_64')
1615+
return docker_run(run_args, architecture='x86_64')
16161616

16171617

16181618
def reproduce(args):
@@ -1631,14 +1631,13 @@ def reproduce_impl( # pylint: disable=too-many-arguments
16311631
testcase_path,
16321632
args,
16331633
architecture='x86_64',
1634-
run_function=docker_run,
1635-
err_result=False):
1634+
run_function=docker_run):
16361635
"""Reproduces a specific test case."""
16371636
if not check_project_exists(project):
1638-
return err_result
1637+
return False
16391638

16401639
if not _check_fuzzer_exists(project, fuzzer_name, args, architecture):
1641-
return err_result
1640+
return False
16421641

16431642
debugger = ''
16441643
env = ['HELPER=True', 'ARCHITECTURE=' + architecture]
@@ -1665,6 +1664,7 @@ def reproduce_impl( # pylint: disable=too-many-arguments
16651664
fuzzer_name,
16661665
'-runs=100',
16671666
] + fuzzer_args
1667+
16681668
return run_function(run_args, architecture=architecture)
16691669

16701670

0 commit comments

Comments
 (0)