mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-10 03:49:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-45196: prevent unittest crash on address sanitizer builds (GH-28331)

Browse source 
(cherry picked from commit b668cdfa09)

Co-authored-by: junyixie <xiejunyi.arch@bytedance.com>
This commit is contained in:
Miss Islington (bot) 2021-09-14 11:54:27 -07:00 • committed by GitHub
parent 13257d9fca
commit 9ccdc90488
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_decimal.py
View file

@ -40,6 +40,17 @@ from test.support import (import_fresh_module, TestFailed,
import random import random
import inspect import inspect
import threading import threading
import sysconfig
_cflags = sysconfig.get_config_var('CFLAGS') or ''
_config_args = sysconfig.get_config_var('CONFIG_ARGS') or ''
MEMORY_SANITIZER = (
'-fsanitize=memory' in _cflags or
'--with-memory-sanitizer' in _config_args
)
ADDRESS_SANITIZER = (
'-fsanitize=address' in _cflags
)
if sys.platform == 'darwin': if sys.platform == 'darwin':
@ -5486,6 +5497,8 @@ class CWhitebox(unittest.TestCase):
# Issue 41540: # Issue 41540:
@unittest.skipIf(sys.platform.startswith("aix"), @unittest.skipIf(sys.platform.startswith("aix"),
"AIX: default ulimit: test is flaky because of extreme over-allocation") "AIX: default ulimit: test is flaky because of extreme over-allocation")
@unittest.skipIf(MEMORY_SANITIZER or ADDRESS_SANITIZER, "sanitizer defaults to crashing "
"instead of returning NULL for malloc failure.")
def test_maxcontext_exact_arith(self): def test_maxcontext_exact_arith(self):
# Make sure that exact operations do not raise MemoryError due # Make sure that exact operations do not raise MemoryError due

10
Lib/test/test_io.py
View file

@ -69,6 +69,10 @@ MEMORY_SANITIZER = (
'--with-memory-sanitizer' in _config_args '--with-memory-sanitizer' in _config_args
) )
ADDRESS_SANITIZER = (
'-fsanitize=address' in _cflags
)
# Does io.IOBase finalizer log the exception if the close() method fails? # Does io.IOBase finalizer log the exception if the close() method fails?
# The exception is ignored silently by default in release build. # The exception is ignored silently by default in release build.
IOBASE_EMITS_UNRAISABLE = (hasattr(sys, "gettotalrefcount") or sys.flags.dev_mode) IOBASE_EMITS_UNRAISABLE = (hasattr(sys, "gettotalrefcount") or sys.flags.dev_mode)
@ -1539,7 +1543,7 @@ class BufferedReaderTest(unittest.TestCase, CommonBufferedTests):
class CBufferedReaderTest(BufferedReaderTest, SizeofTest): class CBufferedReaderTest(BufferedReaderTest, SizeofTest):
tp = io.BufferedReader tp = io.BufferedReader
@unittest.skipIf(MEMORY_SANITIZER, "MSan defaults to crashing " @unittest.skipIf(MEMORY_SANITIZER or ADDRESS_SANITIZER, "sanitizer defaults to crashing "
"instead of returning NULL for malloc failure.") "instead of returning NULL for malloc failure.")
def test_constructor(self): def test_constructor(self):
BufferedReaderTest.test_constructor(self) BufferedReaderTest.test_constructor(self)
@ -1888,7 +1892,7 @@ class BufferedWriterTest(unittest.TestCase, CommonBufferedTests):
class CBufferedWriterTest(BufferedWriterTest, SizeofTest): class CBufferedWriterTest(BufferedWriterTest, SizeofTest):
tp = io.BufferedWriter tp = io.BufferedWriter
@unittest.skipIf(MEMORY_SANITIZER, "MSan defaults to crashing " @unittest.skipIf(MEMORY_SANITIZER or ADDRESS_SANITIZER, "sanitizer defaults to crashing "
"instead of returning NULL for malloc failure.") "instead of returning NULL for malloc failure.")
def test_constructor(self): def test_constructor(self):
BufferedWriterTest.test_constructor(self) BufferedWriterTest.test_constructor(self)
@ -2387,7 +2391,7 @@ class BufferedRandomTest(BufferedReaderTest, BufferedWriterTest):
class CBufferedRandomTest(BufferedRandomTest, SizeofTest): class CBufferedRandomTest(BufferedRandomTest, SizeofTest):
tp = io.BufferedRandom tp = io.BufferedRandom
@unittest.skipIf(MEMORY_SANITIZER, "MSan defaults to crashing " @unittest.skipIf(MEMORY_SANITIZER or ADDRESS_SANITIZER, "sanitizer defaults to crashing "
"instead of returning NULL for malloc failure.") "instead of returning NULL for malloc failure.")
def test_constructor(self): def test_constructor(self):
BufferedRandomTest.test_constructor(self) BufferedRandomTest.test_constructor(self)