diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2014-09-30 11:55:30 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2014-09-30 11:55:30 (GMT) |
| commit | 6b8e0ed562e867ebffed0209266e21d9f0a4bb77 (patch) | |
| tree | abd069262d105e5332fde7c2f77ea76884e55aa9 /Lib/test/test_faulthandler.py | |
| parent | 7a39912ddac3ba0e3cd1674f9fe0f139e8cf0558 (diff) | |
| parent | 5083828d65b6eb617d4333a1c0c4c9b7c3f452a6 (diff) | |
| download | cpython-6b8e0ed562e867ebffed0209266e21d9f0a4bb77.zip cpython-6b8e0ed562e867ebffed0209266e21d9f0a4bb77.tar.gz cpython-6b8e0ed562e867ebffed0209266e21d9f0a4bb77.tar.bz2 | |
(Merge 3.4) faulthandler: test_gil_released() now uses _sigsegv() instead of
_read_null(), because _read_null() cannot be used on AIX. On AIX, reading from
NULL is allowed: the first page of memory is a mapped read-only on AIX.
_read_null() and _sigabrt() don't accept parameters.
Diffstat (limited to 'Lib/test/test_faulthandler.py')
| -rw-r--r-- | Lib/test/test_faulthandler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index ccdf3b6..e396054 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -194,10 +194,10 @@ class FaultHandlerTests(unittest.TestCase): self.check_fatal_error(""" import faulthandler faulthandler.enable() - faulthandler._read_null(True) + faulthandler._sigsegv(True) """, 3, - '(?:Segmentation fault|Bus error|Illegal instruction)') + 'Segmentation fault') def test_enable_file(self): with temporary_filename() as filename: |