Skip to content

Commit

Permalink
Cleanup test_faulthandler sanitizer skip logic. (GH-11381)
Browse files Browse the repository at this point in the history
Also skip the same tests when using the undefined behavior sanitizer
as they much with the output.

Updates a regex in another test to use multi-line mode so that the ubsan
buildbot should pass again rather than also adding a skip to that one.
(cherry picked from commit 30e0232)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
  • Loading branch information
miss-islington and gpshead committed Dec 31, 2018
1 parent a144fee commit e404299
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions Lib/test/test_faulthandler.py
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

0 comments on commit e404299

Please sign in to comment.