Skip to content

[3.7] bpo-35225: Cleanup test_faulthandler sanitizer skip logic. (GH-11381) #11382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Dec 31, 2018
Merged

[3.7] bpo-35225: Cleanup test_faulthandler sanitizer skip logic. (GH-11381) #11382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions Lib/test/test_faulthandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@

TIMEOUT = 0.5
MS_WINDOWS = (os.name == 'nt')
_cflags = sysconfig.get_config_var('CFLAGS') or ''
_config_args = sysconfig.get_config_var('CONFIG_ARGS') or ''
UB_SANITIZER = (
'-fsanitizer=undefined' in _cflags or
'--with-undefined-behavior-sanitizer' in _config_args
)
MEMORY_SANITIZER = (
sysconfig.get_config_var("CONFIG_ARGS") and
("--with-memory-sanitizer" in sysconfig.get_config_var("CONFIG_ARGS"))
'-fsanitizer=memory' in _cflags or
'--with-memory-sanitizer' in _config_args
)


def expected_traceback(lineno1, lineno2, header, min_count=1):
regex = header
regex += ' File "<string>", line %s in func\n' % lineno1
Expand Down Expand Up @@ -99,7 +106,7 @@ def check_error(self, code, line_number, fatal_error, *,
else:
header = 'Stack'
regex = r"""
^{fatal_error}
(?m)^{fatal_error}

{header} \(most recent call first\):
File "<string>", line {lineno} in <module>
Expand Down Expand Up @@ -257,8 +264,8 @@ def test_gil_released(self):
3,
'Segmentation fault')

@unittest.skipIf(MEMORY_SANITIZER,
"memory-sanizer builds change crashing process output.")
@unittest.skipIf(UB_SANITIZER or MEMORY_SANITIZER,
"sanizer builds change crashing process output.")
@skip_segfault_on_android
def test_enable_file(self):
with temporary_filename() as filename:
Expand All @@ -274,8 +281,8 @@ def test_enable_file(self):

@unittest.skipIf(sys.platform == "win32",
"subprocess doesn't support pass_fds on Windows")
@unittest.skipIf(MEMORY_SANITIZER,
"memory-sanizer builds change crashing process output.")
@unittest.skipIf(UB_SANITIZER or MEMORY_SANITIZER,
"sanizer builds change crashing process output.")
@skip_segfault_on_android
def test_enable_fd(self):
with tempfile.TemporaryFile('wb+') as fp:
Expand Down