diff options
| author | fanquake <fanquake@gmail.com> | 2023-10-23 10:10:35 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-10-23 10:10:53 +0100 |
| commit | 0f15db0ec900dc9ac7e395f31045ec92fdb2fe63 (patch) | |
| tree | 94da59b8041f6abcba07fda28b9ebe1903fd2920 | |
| parent | c1106cfef514115e91c2185a58840d7fb0e34c89 (diff) | |
| parent | fa21535551e300eaa988d209ad64cdc17fd7f66b (diff) | |
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
| -rwxr-xr-x | test/fuzz/test_runner.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py index 9d64591111..ec74f7705c 100755 --- a/test/fuzz/test_runner.py +++ b/test/fuzz/test_runner.py @@ -277,6 +277,7 @@ def merge_inputs(*, fuzz_pool, corpus, test_list, src_dir, build_dir, merge_dirs for t in test_list: args = [ os.path.join(build_dir, 'src', 'test', 'fuzz', 'fuzz'), + '-rss_limit_mb=8000', '-set_cover_merge=1', # 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, |