Skip to content

Commit 33ed5fa

Browse files
skirpichevskirpichev
authored
gh-111495: add stub files for C API test modules (GH-111586)
This is to reduce merge conflicts (Modules/Setup.stdlib.in) for subsequent pull requests for the issue.
1 parent d9a5530 commit 33ed5fa

13 files changed

+204
-3
lines changed

‎Modules/Setup.stdlib.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
@MODULE__XXTESTFUZZ_TRUE@_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c
160160
@MODULE__TESTBUFFER_TRUE@_testbuffer _testbuffer.c
161161
@MODULE__TESTINTERNALCAPI_TRUE@_testinternalcapi _testinternalcapi.c _testinternalcapi/test_lock.c _testinternalcapi/pytime.c _testinternalcapi/set.c
162-
@MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/vectorcall_limited.c _testcapi/heaptype.c _testcapi/abstract.c _testcapi/unicode.c _testcapi/dict.c _testcapi/set.c _testcapi/getargs.c _testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c _testcapi/long.c _testcapi/float.c _testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c _testcapi/buffer.c _testcapi/pyatomic.c _testcapi/pyos.c _testcapi/immortal.c _testcapi/heaptype_relative.c _testcapi/gc.c _testcapi/sys.c
162+
@MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/vectorcall_limited.c _testcapi/heaptype.c _testcapi/abstract.c _testcapi/bytearray.c _testcapi/bytes.c _testcapi/unicode.c _testcapi/dict.c _testcapi/set.c _testcapi/list.c _testcapi/tuple.c _testcapi/getargs.c _testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c _testcapi/long.c _testcapi/float.c _testcapi/complex.c _testcapi/numbers.c _testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c _testcapi/buffer.c _testcapi/pyatomic.c _testcapi/pyos.c _testcapi/file.c _testcapi/codec.c _testcapi/immortal.c _testcapi/heaptype_relative.c _testcapi/gc.c _testcapi/sys.c
163163
@MODULE__TESTCLINIC_TRUE@_testclinic _testclinic.c
164164
@MODULE__TESTCLINIC_LIMITED_TRUE@_testclinic_limited _testclinic_limited.c
165165

‎Modules/_testcapi/bytearray.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_ByteArray(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0) {
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapi/bytes.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_Bytes(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0) {
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapi/codec.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_Codec(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0){
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapi/complex.c

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
static PyMethodDef test_methods[] = {
5+
{NULL},
6+
};
7+
8+
int
9+
_PyTestCapi_Init_Complex(PyObject *mod)
10+
{
11+
if (PyModule_AddFunctions(mod, test_methods) < 0) {
12+
return -1;
13+
}
14+
15+
return 0;
16+
}

‎Modules/_testcapi/file.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_File(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0){
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapi/list.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_List(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0){
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapi/numbers.c

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
static PyMethodDef test_methods[] = {
5+
{NULL},
6+
};
7+
8+
int
9+
_PyTestCapi_Init_Numbers(PyObject *mod)
10+
{
11+
if (PyModule_AddFunctions(mod, test_methods) < 0) {
12+
return -1;
13+
}
14+
15+
return 0;
16+
}

‎Modules/_testcapi/parts.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
int _PyTestCapi_Init_Vectorcall(PyObject *module);
3232
int _PyTestCapi_Init_Heaptype(PyObject *module);
3333
int _PyTestCapi_Init_Abstract(PyObject *module);
34+
int _PyTestCapi_Init_ByteArray(PyObject *module);
35+
int _PyTestCapi_Init_Bytes(PyObject *module);
3436
int _PyTestCapi_Init_Unicode(PyObject *module);
3537
int _PyTestCapi_Init_GetArgs(PyObject *module);
3638
int _PyTestCapi_Init_DateTime(PyObject *module);
@@ -39,17 +41,23 @@ int _PyTestCapi_Init_Mem(PyObject *module);
3941
int _PyTestCapi_Init_Watchers(PyObject *module);
4042
int _PyTestCapi_Init_Long(PyObject *module);
4143
int _PyTestCapi_Init_Float(PyObject *module);
44+
int _PyTestCapi_Init_Complex(PyObject *module);
45+
int _PyTestCapi_Init_Numbers(PyObject *module);
4246
int _PyTestCapi_Init_Dict(PyObject *module);
4347
int _PyTestCapi_Init_Set(PyObject *module);
48+
int _PyTestCapi_Init_List(PyObject *module);
49+
int _PyTestCapi_Init_Tuple(PyObject *module);
4450
int _PyTestCapi_Init_Structmember(PyObject *module);
4551
int _PyTestCapi_Init_Exceptions(PyObject *module);
4652
int _PyTestCapi_Init_Code(PyObject *module);
4753
int _PyTestCapi_Init_Buffer(PyObject *module);
4854
int _PyTestCapi_Init_PyAtomic(PyObject *module);
4955
int _PyTestCapi_Init_PyOS(PyObject *module);
56+
int _PyTestCapi_Init_File(PyObject *module);
57+
int _PyTestCapi_Init_Codec(PyObject *module);
5058
int _PyTestCapi_Init_Immortal(PyObject *module);
51-
int _PyTestCapi_Init_GC(PyObject *mod);
52-
int _PyTestCapi_Init_Sys(PyObject *);
59+
int _PyTestCapi_Init_GC(PyObject *module);
60+
int _PyTestCapi_Init_Sys(PyObject *module);
5361

5462
int _PyTestCapi_Init_VectorcallLimited(PyObject *module);
5563
int _PyTestCapi_Init_HeaptypeRelative(PyObject *module);

‎Modules/_testcapi/tuple.c

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#include "parts.h"
2+
#include "util.h"
3+
4+
5+
static PyMethodDef test_methods[] = {
6+
{NULL},
7+
};
8+
9+
int
10+
_PyTestCapi_Init_Tuple(PyObject *m)
11+
{
12+
if (PyModule_AddFunctions(m, test_methods) < 0){
13+
return -1;
14+
}
15+
16+
return 0;
17+
}

‎Modules/_testcapimodule.c

+24
Original file line numberDiff line numberDiff line change
@@ -3908,6 +3908,12 @@ PyInit__testcapi(void)
39083908
if (_PyTestCapi_Init_Abstract(m) < 0) {
39093909
return NULL;
39103910
}
3911+
if (_PyTestCapi_Init_ByteArray(m) < 0) {
3912+
return NULL;
3913+
}
3914+
if (_PyTestCapi_Init_Bytes(m) < 0) {
3915+
return NULL;
3916+
}
39113917
if (_PyTestCapi_Init_Unicode(m) < 0) {
39123918
return NULL;
39133919
}
@@ -3932,12 +3938,24 @@ PyInit__testcapi(void)
39323938
if (_PyTestCapi_Init_Float(m) < 0) {
39333939
return NULL;
39343940
}
3941+
if (_PyTestCapi_Init_Complex(m) < 0) {
3942+
return NULL;
3943+
}
3944+
if (_PyTestCapi_Init_Numbers(m) < 0) {
3945+
return NULL;
3946+
}
39353947
if (_PyTestCapi_Init_Dict(m) < 0) {
39363948
return NULL;
39373949
}
39383950
if (_PyTestCapi_Init_Set(m) < 0) {
39393951
return NULL;
39403952
}
3953+
if (_PyTestCapi_Init_List(m) < 0) {
3954+
return NULL;
3955+
}
3956+
if (_PyTestCapi_Init_Tuple(m) < 0) {
3957+
return NULL;
3958+
}
39413959
if (_PyTestCapi_Init_Structmember(m) < 0) {
39423960
return NULL;
39433961
}
@@ -3953,6 +3971,12 @@ PyInit__testcapi(void)
39533971
if (_PyTestCapi_Init_PyOS(m) < 0) {
39543972
return NULL;
39553973
}
3974+
if (_PyTestCapi_Init_File(m) < 0) {
3975+
return NULL;
3976+
}
3977+
if (_PyTestCapi_Init_Codec(m) < 0) {
3978+
return NULL;
3979+
}
39563980
if (_PyTestCapi_Init_Sys(m) < 0) {
39573981
return NULL;
39583982
}

‎PCbuild/_testcapi.vcxproj

+8
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,29 @@
100100
<ClCompile Include="..\Modules\_testcapi\heaptype.c" />
101101
<ClCompile Include="..\Modules\_testcapi\heaptype_relative.c" />
102102
<ClCompile Include="..\Modules\_testcapi\abstract.c" />
103+
<ClCompile Include="..\Modules\_testcapi\bytearray.c" />
104+
<ClCompile Include="..\Modules\_testcapi\bytes.c" />
103105
<ClCompile Include="..\Modules\_testcapi\unicode.c" />
104106
<ClCompile Include="..\Modules\_testcapi\dict.c" />
105107
<ClCompile Include="..\Modules\_testcapi\set.c" />
108+
<ClCompile Include="..\Modules\_testcapi\list.c" />
109+
<ClCompile Include="..\Modules\_testcapi\tuple.c" />
106110
<ClCompile Include="..\Modules\_testcapi\datetime.c" />
107111
<ClCompile Include="..\Modules\_testcapi\docstring.c" />
108112
<ClCompile Include="..\Modules\_testcapi\mem.c" />
109113
<ClCompile Include="..\Modules\_testcapi\watchers.c" />
110114
<ClCompile Include="..\Modules\_testcapi\float.c" />
115+
<ClCompile Include="..\Modules\_testcapi\complex.c" />
111116
<ClCompile Include="..\Modules\_testcapi\long.c" />
117+
<ClCompile Include="..\Modules\_testcapi\numbers.c" />
112118
<ClCompile Include="..\Modules\_testcapi\structmember.c" />
113119
<ClCompile Include="..\Modules\_testcapi\exceptions.c" />
114120
<ClCompile Include="..\Modules\_testcapi\code.c" />
115121
<ClCompile Include="..\Modules\_testcapi\buffer.c" />
116122
<ClCompile Include="..\Modules\_testcapi\pyatomic.c" />
117123
<ClCompile Include="..\Modules\_testcapi\pyos.c" />
124+
<ClCompile Include="..\Modules\_testcapi\file.c" />
125+
<ClCompile Include="..\Modules\_testcapi\codec.c" />
118126
<ClCompile Include="..\Modules\_testcapi\sys.c" />
119127
<ClCompile Include="..\Modules\_testcapi\immortal.c" />
120128
<ClCompile Include="..\Modules\_testcapi\gc.c" />

‎PCbuild/_testcapi.vcxproj.filters

+27
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,27 @@
3030
<ClCompile Include="..\Modules\_testcapi\abstract.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33+
<ClCompile Include="..\Modules\_testcapi\bytearray.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
36+
<ClCompile Include="..\Modules\_testcapi\bytes.c">
37+
<Filter>Source Files</Filter>
38+
</ClCompile>
3339
<ClCompile Include="..\Modules\_testcapi\unicode.c">
3440
<Filter>Source Files</Filter>
3541
</ClCompile>
3642
<ClCompile Include="..\Modules\_testcapi\dict.c">
3743
<Filter>Source Files</Filter>
3844
</ClCompile>
45+
<ClCompile Include="..\Modules\_testcapi\set.c">
46+
<Filter>Source Files</Filter>
47+
</ClCompile>
48+
<ClCompile Include="..\Modules\_testcapi\list.c">
49+
<Filter>Source Files</Filter>
50+
</ClCompile>
51+
<ClCompile Include="..\Modules\_testcapi\tuple.c">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
3954
<ClCompile Include="..\Modules\_testcapi\datetime.c">
4055
<Filter>Source Files</Filter>
4156
</ClCompile>
@@ -54,6 +69,12 @@
5469
<ClCompile Include="..\Modules\_testcapi\long.c">
5570
<Filter>Source Files</Filter>
5671
</ClCompile>
72+
<ClCompile Include="..\Modules\_testcapi\complex.c">
73+
<Filter>Source Files</Filter>
74+
</ClCompile>
75+
<ClCompile Include="..\Modules\_testcapi\numbers.c">
76+
<Filter>Source Files</Filter>
77+
</ClCompile>
5778
<ClCompile Include="..\Modules\_testcapi\structmember.c">
5879
<Filter>Source Files</Filter>
5980
</ClCompile>
@@ -72,6 +93,12 @@
7293
<ClCompile Include="..\Modules\_testcapi\pyos.c">
7394
<Filter>Source Files</Filter>
7495
</ClCompile>
96+
<ClCompile Include="..\Modules\_testcapi\file.c">
97+
<Filter>Source Files</Filter>
98+
</ClCompile>
99+
<ClCompile Include="..\Modules\_testcapi\codec.c">
100+
<Filter>Source Files</Filter>
101+
</ClCompile>
75102
<ClCompile Include="..\Modules\_testcapi\sys.c">
76103
<Filter>Source Files</Filter>
77104
</ClCompile>

0 commit comments

Comments
 (0)