Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3a1ac87

Browse files
authored
gh-90791: test.pythoninfo logs ASAN_OPTIONS env var (#108289)
* Cleanup libregrtest code logging ASAN_OPTIONS.* Fix a typo on "ASAN_OPTIONS" vs "MSAN_OPTIONS".
1 parenta0bb4a3 commit3a1ac87

File tree

3 files changed

+39
-25
lines changed

3 files changed

+39
-25
lines changed

‎Lib/test/libregrtest/main.py‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -526,26 +526,33 @@ def display_header(self):
526526
print("== CPU count:",cpu_count)
527527
print("== encodings: locale=%s, FS=%s"
528528
% (locale.getencoding(),sys.getfilesystemencoding()))
529+
self.display_sanitizers()
530+
531+
defdisplay_sanitizers(self):
532+
# This makes it easier to remember what to set in your local
533+
# environment when trying to reproduce a sanitizer failure.
529534
asan=support.check_sanitizer(address=True)
530535
msan=support.check_sanitizer(memory=True)
531536
ubsan=support.check_sanitizer(ub=True)
532-
# This makes it easier to remember what to set in your local
533-
# environment when trying to reproduce a sanitizer failure.
534-
ifasanormsanorubsan:
535-
names= [nfornin (asanand"address",
536-
msanand"memory",
537-
ubsanand"undefined behavior")
538-
ifn]
539-
print(f"== sanitizers:{', '.join(names)}")
540-
a_opts=os.environ.get("ASAN_OPTIONS")
541-
ifasananda_optsisnotNone:
542-
print(f"== ASAN_OPTIONS={a_opts}")
543-
m_opts=os.environ.get("ASAN_OPTIONS")
544-
ifmsanandm_optsisnotNone:
545-
print(f"== MSAN_OPTIONS={m_opts}")
546-
ub_opts=os.environ.get("UBSAN_OPTIONS")
547-
ifubsanandub_optsisnotNone:
548-
print(f"== UBSAN_OPTIONS={ub_opts}")
537+
sanitizers= []
538+
ifasan:
539+
sanitizers.append("address")
540+
ifmsan:
541+
sanitizers.append("memory")
542+
ifubsan:
543+
sanitizers.append("undefined behavior")
544+
ifnotsanitizers:
545+
return
546+
547+
print(f"== sanitizers:{', '.join(sanitizers)}")
548+
forsanitizer,env_varin (
549+
(asan,"ASAN_OPTIONS"),
550+
(msan,"MSAN_OPTIONS"),
551+
(ubsan,"UBSAN_OPTIONS"),
552+
):
553+
options=os.environ.get(env_var)
554+
ifsanitizerandoptionsisnotNone:
555+
print(f"=={env_var}={options!r}")
549556

550557
defno_tests_run(self):
551558
returnnotany((self.good,self.bad,self.skipped,self.interrupted,

‎Lib/test/pythoninfo.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,13 @@ def format_groups(groups):
308308
"_PYTHON_PROJECT_BASE",
309309
"_PYTHON_SYSCONFIGDATA_NAME",
310310
"__PYVENV_LAUNCHER__",
311+
312+
# Sanitizer options
313+
"ASAN_OPTIONS",
314+
"LSAN_OPTIONS",
315+
"MSAN_OPTIONS",
316+
"TSAN_OPTIONS",
317+
"UBSAN_OPTIONS",
311318
))
312319
forname,valueinos.environ.items():
313320
uname=name.upper()

‎Lib/test/support/__init__.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -407,19 +407,19 @@ def check_sanitizer(*, address=False, memory=False, ub=False):
407407
raiseValueError('At least one of address, memory, or ub must be True')
408408

409409

410-
_cflags=sysconfig.get_config_var('CFLAGS')or''
411-
_config_args=sysconfig.get_config_var('CONFIG_ARGS')or''
410+
cflags=sysconfig.get_config_var('CFLAGS')or''
411+
config_args=sysconfig.get_config_var('CONFIG_ARGS')or''
412412
memory_sanitizer= (
413-
'-fsanitize=memory'in_cflagsor
414-
'--with-memory-sanitizer'in_config_args
413+
'-fsanitize=memory'incflagsor
414+
'--with-memory-sanitizer'inconfig_args
415415
)
416416
address_sanitizer= (
417-
'-fsanitize=address'in_cflagsor
418-
'--with-address-sanitizer'in_config_args
417+
'-fsanitize=address'incflagsor
418+
'--with-address-sanitizer'inconfig_args
419419
)
420420
ub_sanitizer= (
421-
'-fsanitize=undefined'in_cflagsor
422-
'--with-undefined-behavior-sanitizer'in_config_args
421+
'-fsanitize=undefined'incflagsor
422+
'--with-undefined-behavior-sanitizer'inconfig_args
423423
)
424424
return (
425425
(memoryandmemory_sanitizer)or

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp