highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-23 23:33:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #20971: test: Work around libFuzzer deadlock

Browse Source 
fa39c8a3e8f1090103468780d122a4cf4191bc13 test: Work around libFuzzer deadlock (MarcoFalke)

Pull request description:

  Only required part is `symbolize=0`, but the other changes shouldn't hurt

ACKs for top commit:
  practicalswift:
    cr ACK fa39c8a3e8f1090103468780d122a4cf4191bc13: patch looks correct

Tree-SHA512: 9cddf1de46ad12aea9b8be2c1acb86ba0e07ffdb52f8155d943edf970955551c7cb049a3a6c027846b45dab0dc0966dec42999476ebde50aa761a08dbb751eae
This commit is contained in:
MarcoFalke 2021-01-26 09:56:15 +01:00
commit ce75fc36ed
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/fuzz/test_runner.py
View File

@ -14,6 +14,14 @@ import subprocess
import sys import sys
def get_fuzz_env(*, target):
return {
'FUZZ': target,
'ASAN_OPTIONS': # symbolizer disabled due to https://github.com/google/sanitizers/issues/1364#issuecomment-761072085
'symbolize=0:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1',
}
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
formatter_class=argparse.ArgumentDefaultsHelpFormatter, formatter_class=argparse.ArgumentDefaultsHelpFormatter,
@ -129,9 +137,7 @@ def main():
os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', 'fuzz'), os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', 'fuzz'),
'-help=1', '-help=1',
], ],
env={ env=get_fuzz_env(target=test_list_selection[0]),
'FUZZ': test_list_selection[0]
},
timeout=20, timeout=20,
check=True, check=True,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
@ -186,9 +192,7 @@ def generate_corpus_seeds(*, fuzz_pool, build_dir, seed_dir, targets):
' '.join(command), ' '.join(command),
subprocess.run( subprocess.run(
command, command,
env={ env=get_fuzz_env(target=t),
'FUZZ': t
},
check=True, check=True,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True, universal_newlines=True,
@ -227,9 +231,7 @@ def merge_inputs(*, fuzz_pool, corpus, test_list, build_dir, merge_dir):
output = 'Run {} with args {}\n'.format(t, " ".join(args)) output = 'Run {} with args {}\n'.format(t, " ".join(args))
output += subprocess.run( output += subprocess.run(
args, args,
env={ env=get_fuzz_env(target=t),
'FUZZ': t
},
check=True, check=True,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True, universal_newlines=True,
@ -257,7 +259,12 @@ def run_once(*, fuzz_pool, corpus, test_list, build_dir, use_valgrind):
def job(t, args): def job(t, args):
output = 'Run {} with args {}'.format(t, args) output = 'Run {} with args {}'.format(t, args)
result = subprocess.run(args, env={'FUZZ': t}, stderr=subprocess.PIPE, universal_newlines=True) result = subprocess.run(
args,
env=get_fuzz_env(target=t),
stderr=subprocess.PIPE,
universal_newlines=True,
)
output += result.stderr output += result.stderr
return output, result return output, result