Merge 22435f0cf6 into merged_master (Bitcoin PR #20759)

This commit is contained in:
Andrew Poelstra 2021-06-16 02:05:47 +00:00
commit 3c40a813e2

View file

@ -54,7 +54,7 @@ def main():
)
parser.add_argument(
'--m_dir',
help='Merge inputs from this directory into the seed_dir. Needs /target subdirectory.',
help='Merge inputs from this directory into the seed_dir.',
)
parser.add_argument(
'-g',
@ -210,7 +210,7 @@ def generate_corpus_seeds(*, fuzz_pool, build_dir, seed_dir, targets):
def merge_inputs(*, fuzz_pool, corpus, test_list, build_dir, merge_dir):
logging.info("Merge the inputs in the passed dir into the seed_dir. Passed dir {}".format(merge_dir))
logging.info("Merge the inputs from the passed dir into the seed_dir. Passed dir {}".format(merge_dir))
jobs = []
for t in test_list:
args = [