Skip to content

Commit 65dcbec

Browse files
committed
Merge bitcoin#32209: test: Preserve llvm profile path
c5a7ffd preserve llvm profile env (Prabhat Verma) Pull request description: While generating `profraw` for fuzz tests using steps in [PR 32206](bitcoin#32206) , the profraw was not being built at the desired location and only one `default.profraw` was being created which was being overwritten for multiple fuzz targets. This PR fixes that. ACKs for top commit: maflcko: lgtm ACK c5a7ffd mabu44: ACK c5a7ffd Tree-SHA512: 11f74caa8cba6f841aa899a5e294f658aed1b6a3d4cf68992609ea99fadb4a092b2350ffacea5c2d5eb377eb10082de018f27a1d6486a72460cb3905aaa15664
2 parents b34d49a + c5a7ffd commit 65dcbec

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

test/fuzz/test_runner.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import configparser
1212
import logging
1313
import os
14-
import platform
1514
import random
1615
import subprocess
1716
import sys
1817

1918

2019
def get_fuzz_env(*, target, source_dir):
2120
symbolizer = os.environ.get('LLVM_SYMBOLIZER_PATH', "/usr/bin/llvm-symbolizer")
22-
fuzz_env = {
21+
fuzz_env = os.environ | {
2322
'FUZZ': target,
2423
'UBSAN_OPTIONS':
2524
f'suppressions={source_dir}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1',
@@ -28,9 +27,6 @@ def get_fuzz_env(*, target, source_dir):
2827
'ASAN_SYMBOLIZER_PATH': symbolizer,
2928
'MSAN_SYMBOLIZER_PATH': symbolizer,
3029
}
31-
if platform.system() == "Windows":
32-
# On Windows, `env` option must include valid `SystemRoot`.
33-
fuzz_env = {**fuzz_env, 'SystemRoot': os.environ.get('SystemRoot')}
3430
return fuzz_env
3531

3632

0 commit comments

Comments
 (0)