Skip to content

Commit fa48040

Browse files
author
MarcoFalke
committed
fuzz: Remove unused TimeoutExpired catch in fuzz runner
Can be reviewed with --ignore-all-space
1 parent 14b8dfb commit fa48040

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

test/fuzz/test_runner.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -151,24 +151,21 @@ def main():
151151
)
152152
logging.info("Please consider adding a fuzz corpus at https://github.com/bitcoin-core/qa-assets")
153153

154-
try:
155-
help_output = subprocess.run(
156-
args=[
157-
fuzz_bin,
158-
'-help=1',
159-
],
160-
env=get_fuzz_env(target=test_list_selection[0], source_dir=config['environment']['SRCDIR']),
161-
timeout=20,
162-
check=False,
163-
stderr=subprocess.PIPE,
164-
text=True,
165-
).stderr
166-
using_libfuzzer = "libFuzzer" in help_output
167-
if (args.generate or args.m_dir) and not using_libfuzzer:
168-
logging.error("Must be built with libFuzzer")
169-
sys.exit(1)
170-
except subprocess.TimeoutExpired:
171-
logging.error("subprocess timed out: Currently only libFuzzer is supported")
154+
print("Check if using libFuzzer ... ", end='')
155+
help_output = subprocess.run(
156+
args=[
157+
fuzz_bin,
158+
'-help=1',
159+
],
160+
env=get_fuzz_env(target=test_list_selection[0], source_dir=config['environment']['SRCDIR']),
161+
check=False,
162+
stderr=subprocess.PIPE,
163+
text=True,
164+
).stderr
165+
using_libfuzzer = "libFuzzer" in help_output
166+
print(using_libfuzzer)
167+
if (args.generate or args.m_dir) and not using_libfuzzer:
168+
logging.error("Must be built with libFuzzer")
172169
sys.exit(1)
173170

174171
with ThreadPoolExecutor(max_workers=args.par) as fuzz_pool:

0 commit comments

Comments
 (0)