Move the tests to a function

Author: encukou

Modules/_testcapimodule.c

@@ -2607,6 +2607,40 @@ create_managed_weakref_nogc_type(PyObject *self, PyObject *Py_UNUSED(args))
 }
 
 
+static PyObject*
+test_soft_deprecated_macros(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(args)) {
+    // Test soft-deprecated macros
+    Py_ALIGNED(64) char buf[4];
+    #ifdef __GNUC__
+        // Py_ALIGNED must compile everywhere, but only does something
+        // on "supported" compilers, i.e. GCC
+        Py_BUILD_ASSERT(__extension__ __alignof__(buf) >= 64);
+    #endif
+    assert(strcmp(PY_FORMAT_SIZE_T, "z") == 0);
+    Py_BUILD_ASSERT(Py_LL(123) == 123LL);
+    Py_BUILD_ASSERT(sizeof(Py_LL(123)) == sizeof(long long));
+    Py_BUILD_ASSERT(sizeof(Py_ULL(123)) == sizeof(unsigned long long));
+    Py_BUILD_ASSERT(sizeof(PY_LONG_LONG) == sizeof(long long));
+    Py_BUILD_ASSERT(sizeof(PY_INT32_T) == sizeof(int32_t));
+    Py_BUILD_ASSERT(sizeof(PY_UINT32_T) == sizeof(uint32_t));
+    Py_BUILD_ASSERT(sizeof(PY_INT64_T) == sizeof(int64_t));
+    Py_BUILD_ASSERT(sizeof(PY_UINT64_T) == sizeof(uint64_t));
+    Py_BUILD_ASSERT(PY_LLONG_MIN == LLONG_MIN);
+    Py_BUILD_ASSERT(PY_LLONG_MAX == LLONG_MAX);
+    Py_BUILD_ASSERT(PY_ULLONG_MAX == ULLONG_MAX);
+    Py_BUILD_ASSERT(PY_SIZE_MAX == SIZE_MAX);
+    Py_BUILD_ASSERT(PY_LLONG_MIN == LLONG_MIN);
+    Py_MEMCPY(buf, "abc", 4);
+    assert(strcmp(buf, "abc") == 0);
+    Py_BUILD_ASSERT(Py_UNICODE_SIZE == sizeof(wchar_t));
+    #ifdef Py_UNICODE_WIDE
+        Py_BUILD_ASSERT(sizeof(wchar_t) >= 4);
+    #else
+        Py_BUILD_ASSERT(sizeof(wchar_t) < 4);
+    #endif
+    Py_RETURN_NONE;
+}
+
 static PyMethodDef TestMethods[] = {
     {"set_errno",               set_errno,                       METH_VARARGS},
     {"test_config",             test_config,                     METH_NOARGS},
@@ -2704,6 +2738,7 @@ static PyMethodDef TestMethods[] = {
     {"toggle_reftrace_printer", toggle_reftrace_printer, METH_O},
     {"create_managed_weakref_nogc_type",
         create_managed_weakref_nogc_type, METH_NOARGS},
+    {"test_soft_deprecated_macros", test_soft_deprecated_macros, METH_NOARGS},
     {NULL, NULL} /* sentinel */
 };
 
@@ -3372,34 +3407,6 @@ _testcapi_exec(PyObject *m)
     PyModule_AddObject(m, "INT64_MAX", PyLong_FromInt64(INT64_MAX));
     PyModule_AddObject(m, "UINT64_MAX", PyLong_FromUInt64(UINT64_MAX));
 
-    // Test soft-deprecated macros
-    Py_ALIGNED(64) char buf[4];
-    #if defined(__GNUC__)
-        Py_BUILD_ASSERT(__extension__ __alignof__(buf) >= 64);
-    #endif
-    assert(strcmp(PY_FORMAT_SIZE_T, "z") == 0);
-    Py_BUILD_ASSERT(Py_LL(123) == 123LL);
-    Py_BUILD_ASSERT(sizeof(Py_LL(123)) == sizeof(long long));
-    Py_BUILD_ASSERT(sizeof(Py_ULL(123)) == sizeof(unsigned long long));
-    Py_BUILD_ASSERT(sizeof(PY_LONG_LONG) == sizeof(long long));
-    Py_BUILD_ASSERT(sizeof(PY_INT32_T) == sizeof(int32_t));
-    Py_BUILD_ASSERT(sizeof(PY_UINT32_T) == sizeof(uint32_t));
-    Py_BUILD_ASSERT(sizeof(PY_INT64_T) == sizeof(int64_t));
-    Py_BUILD_ASSERT(sizeof(PY_UINT64_T) == sizeof(uint64_t));
-    Py_BUILD_ASSERT(PY_LLONG_MIN == LLONG_MIN);
-    Py_BUILD_ASSERT(PY_LLONG_MAX == LLONG_MAX);
-    Py_BUILD_ASSERT(PY_ULLONG_MAX == ULLONG_MAX);
-    Py_BUILD_ASSERT(PY_SIZE_MAX == SIZE_MAX);
-    Py_BUILD_ASSERT(PY_LLONG_MIN == LLONG_MIN);
-    Py_MEMCPY(buf, "abc", 4);
-    assert(strcmp(buf, "abc") == 0);
-    Py_BUILD_ASSERT(Py_UNICODE_SIZE == sizeof(wchar_t));
-    #ifdef Py_UNICODE_WIDE
-        Py_BUILD_ASSERT(sizeof(wchar_t) >= 4);
-    #else
-        Py_BUILD_ASSERT(sizeof(wchar_t) < 4);
-    #endif
-
 #ifdef HAVE_PPOLL
     if (PyModule_AddObjectRef(m, "HAVE_PPOLL", Py_True) < 0) {
         return -1;