gh-108297: Update test_crashers

Lib/test/crashers/README → Lib/test/test_crashers/README

@@ -5,7 +5,7 @@ too obscure to invest the effort.
 
 Each test should fail when run from the command line:
 
-	./python Lib/test/crashers/weakref_in_del.py
+    ./python Lib/test/test_crashers/bogus_code_obj.py
 
 Put as much info into a docstring or comments to help determine the cause of the
 failure, as well as a bugs.python.org issue number if it exists.  Particularly
@@ -15,6 +15,6 @@ Once the crash is fixed, the test case should be moved into an appropriate test
 (even if it was originally from the test suite).  This ensures the regression
 doesn't happen again.  And if it does, it should be easier to track down.
 
-Also see Lib/test_crashers.py which exercises the crashers in this directory.
-In particular, make sure to add any new infinite loop crashers to the black
-list so it doesn't try to run them.
+Also see Lib/test/test_crashers/__init__.py which exercises the crashers in
+this directory. In particular, make sure to add any new infinite loop crashers
+to the black list so it doesn't try to run them.

Lib/test/test_crashers/__init__.py

@@ -0,0 +1,50 @@
+# Tests that the crashers in the Lib/test/crashers directory actually
+# do crash the interpreter as expected
+#
+# If a crasher is fixed, it should be moved elsewhere in the test suite to
+# ensure it continues to work correctly.
+
+import glob
+import os.path
+import unittest
+from test import support
+from test.support.script_helper import assert_python_failure
+
+
+CRASHER_DIR = os.path.abspath(os.path.dirname(__file__))
+CRASHER_FILES = os.path.join(glob.escape(CRASHER_DIR), "*.py")
+infinite_loops = frozenset(["infinite_loop_re.py"])
+
+
+@support.skip_if_sanitizer(address=True, memory=True)
+@support.cpython_only
+class CrasherTest(unittest.TestCase):
+    def test_crashers_crash(self):
+        if support.verbose:
+            print()
+        for fname in glob.glob(CRASHER_FILES):
+            script = os.path.basename(fname)
+            if script == "__init__.py":
+                continue
+            if script in infinite_loops:
+                continue
+            # Some "crashers" only trigger an exception rather than a
+            # segfault. Consider that an acceptable outcome.
+            if support.verbose:
+                print(f"Checking crasher: {script}", flush=True)
+            proc = assert_python_failure(fname)
+            if os.name != "nt":
+                # On Unix, if proc.rc is negative, the process was killed
+                # by a signal
+                self.assertLess(proc.rc, 0, proc)
+            else:
+                # Windows. For example, C0000005 is an Access Violation
+                self.assertGreaterEqual(proc.rc, 0xC0000000, proc)
+
+
+def tearDownModule():
+    support.reap_children()
+
+
+if __name__ == "__main__":
+    unittest.main()

Lib/test/crashers/bogus_code_obj.py → Lib/test/test_crashers/bogus_code_obj.py

@@ -12,8 +12,13 @@
 
 """
 
-import types
+from test.support import SuppressCrashReport
 
-co = types.CodeType(0, 0, 0, 0, 0, 0, b'\x04\x00\x71\x00',
-                    (), (), (), '', '', 1, b'')
-exec(co)
+def func():
+    pass
+
+invalid_code = b'\x04\x00\x71\x00'
+func.__code__ = func.__code__.replace(co_code=invalid_code)
+
+with SuppressCrashReport():
+    func()

Lib/test/crashers/gc_inspection.py → Lib/test/test_crashers/gc_inspection.py

@@ -15,9 +15,14 @@
 fixes to the documentation for extension module writers.  It's unlikely
 to happen, though.  So this is currently classified as
 "gc.get_referrers() is dangerous, use only for debugging".
+
+* https://github.com/python/cpython/issues/39117
+* https://github.com/python/cpython/issues/59313
+* https://github.com/python/cpython/pull/107183
 """
 
 import gc
+from test.support import SuppressCrashReport
 
 
 def g():
@@ -29,4 +34,5 @@ def g():
     print(tup[1])
 
 
-tuple(g())
+with SuppressCrashReport():
+    tuple(g())

Lib/test/crashers/underlying_dict.py → Lib/test/test_crashers/underlying_dict.py

@@ -1,3 +1,4 @@
+from test.support import SuppressCrashReport
 import gc
 
 thingy = object()
@@ -17,4 +18,5 @@ def f(self):
     a.f()
 dct["f"] = lambda self: 2
 
-print(a.f()) # should print 1
+with SuppressCrashReport():
+    print(a.f())  # should print 1

Makefile.pre.in

@@ -2144,7 +2144,6 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/audiodata \
 		test/capath \
 		test/cjkencodings \
-		test/crashers \
 		test/data \
 		test/decimaltestdata \
 		test/dtracedata \
@@ -2157,6 +2156,7 @@ TESTSUBDIRS=	idlelib/idle_test \
 		test/test_asyncio \
 		test/test_capi \
 		test/test_cppext \
+		test/test_crashers \
 		test/test_ctypes \
 		test/test_email \
 		test/test_email/data \