Merge bitcoin/bitcoin#28697: fuzz: Increase merge -rss_limit_mb

fa21535551e300eaa988d209ad64cdc17fd7f66b fuzz: Increase merge -rss_limit_mb (MarcoFalke)

Pull request description:

  For some reason, the limit is hit. (Presumably due to `-set_cover_merge=1` eating more memory, or by simply having more fuzz inputs).

  Fix it by increasing it for the merge operation.

ACKs for top commit:
  dergoegge:
    ACK fa21535551e300eaa988d209ad64cdc17fd7f66b
  hebasto:
    ACK fa21535551e300eaa988d209ad64cdc17fd7f66b, considering the discussion in https://github.com/bitcoin-core/qa-assets/pull/155.

Tree-SHA512: 4fed0f254eccc6fe0b53656bc345ff898b13811dc39387387317d34b521ab77cee03d82b0896dd92d253b7546b6a7e4bdcd478749f47064374ab44ad759ab9ff
This commit is contained in:
fanquake 2023-10-23 10:10:35 +01:00 committed by pasta
parent 90a1fb0e8d
commit 0278163aa3
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38

View File

@ -224,6 +224,7 @@ def merge_inputs(*, fuzz_pool, corpus, test_list, src_dir, build_dir, merge_dir)
for t in test_list: for t in test_list:
args = [ args = [
os.path.join(build_dir, 'src', 'test', 'fuzz', 'fuzz'), os.path.join(build_dir, 'src', 'test', 'fuzz', 'fuzz'),
'-rss_limit_mb=8000',
'-set_cover_merge=1', '-set_cover_merge=1',
# set_cover_merge is used instead of -merge=1 to reduce the overall # set_cover_merge is used instead of -merge=1 to reduce the overall
# size of the qa-assets git repository a bit, but more importantly, # size of the qa-assets git repository a bit, but more importantly,