mirror of https://github.com/python/cpython
Renamed _testXXX to _testcapiXXX. Jack is my hero -- good call!
This commit is contained in:
Tim Peters
parent
693291ba23
commit
d66595fe42
|
|
@ -1,16 +1,16 @@
|
|||
# Run the _test module tests (tests for the Python/C API): by defn, these
|
||||
# are all functions _test exports whose name begins with 'test_'.
|
||||
# Run the _testcapi module tests (tests for the Python/C API): by defn,
|
||||
# these are all functions _test exports whose name begins with 'test_'.
|
||||
|
||||
import sys
|
||||
import test_support
|
||||
import _test
|
||||
import _testcapi
|
||||
|
||||
for name in dir(_test):
|
||||
for name in dir(_testcapi):
|
||||
if name.startswith('test_'):
|
||||
test = getattr(_test, name)
|
||||
test = getattr(_testcapi, name)
|
||||
if test_support.verbose:
|
||||
print "internal", name
|
||||
try:
|
||||
test()
|
||||
except _test.error:
|
||||
except _testcapi.error:
|
||||
raise test_support.TestFailed, sys.exc_info()[1]
|
||||
|
|
|
|||
11
Misc/NEWS
11
Misc/NEWS
|
|
@ -1,3 +1,14 @@
|
|||
What's New in Python 2.1 alpha 507?
|
||||
===================================
|
||||
|
||||
Core language, builtins, and interpreter
|
||||
|
||||
Standard library
|
||||
|
||||
Windows changes
|
||||
|
||||
- Build: Subproject _test (effectively) renamed to _testcapi.
|
||||
|
||||
What's New in Python 2.1 alpha 2?
|
||||
=================================
|
||||
|
||||
|
|
|
|||
|
|
@ -56,13 +56,13 @@ static PyMethodDef TestMethods[] = {
|
|||
};
|
||||
|
||||
DL_EXPORT(void)
|
||||
init_test(void)
|
||||
init_testcapi(void)
|
||||
{
|
||||
PyObject *m, *d;
|
||||
|
||||
m = Py_InitModule("_test", TestMethods);
|
||||
m = Py_InitModule("_testcapi", TestMethods);
|
||||
|
||||
TestError = PyErr_NewException("_test.error", NULL, NULL);
|
||||
TestError = PyErr_NewException("_testcapi.error", NULL, NULL);
|
||||
d = PyModule_GetDict(m);
|
||||
PyDict_SetItemString(d, "error", TestError);
|
||||
}
|
||||
|
|
@ -1,35 +1,35 @@
|
|||
# Microsoft Developer Studio Project File - Name="_test" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Project File - Name="_testcapi" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
|
||||
CFG=_test - Win32 Debug
|
||||
CFG=_testcapi - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "_test.mak".
|
||||
!MESSAGE NMAKE /f "_testcapi.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "_test.mak" CFG="_test - Win32 Debug"
|
||||
!MESSAGE NMAKE /f "_testcapi.mak" CFG="_testcapi - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "_test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_testcapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "_testcapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName "_test"
|
||||
# PROP Scc_ProjName "_testcapi"
|
||||
# PROP Scc_LocalPath ".."
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "_test - Win32 Release"
|
||||
!IF "$(CFG)" == "_testcapi - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
|
|
@ -39,7 +39,7 @@ RSC=rc.exe
|
|||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "."
|
||||
# PROP Intermediate_Dir "x86-temp-release\_test"
|
||||
# PROP Intermediate_Dir "x86-temp-release\_testcapi"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
F90=df.exe
|
||||
|
|
@ -54,10 +54,10 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /machine:I386 /out:"./_test.pyd" /export:init_test
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /machine:I386 /out:"./_testcapi.pyd" /export:init_testcapi
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "_test - Win32 Debug"
|
||||
!ELSEIF "$(CFG)" == "_testcapi - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
|
|
@ -67,7 +67,7 @@ LINK32=link.exe
|
|||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "."
|
||||
# PROP Intermediate_Dir "x86-temp-debug\_test"
|
||||
# PROP Intermediate_Dir "x86-temp-debug\_testcapi"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
F90=df.exe
|
||||
|
|
@ -82,18 +82,18 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /debug /machine:I386 /out:"./_test_d.pyd" /pdbtype:sept /export:init_test
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /dll /debug /machine:I386 /out:"./_testcapi_d.pyd" /pdbtype:sept /export:init_testcapi
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "_test - Win32 Release"
|
||||
# Name "_test - Win32 Debug"
|
||||
# Name "_testcapi - Win32 Release"
|
||||
# Name "_testcapi - Win32 Debug"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\Modules\_testmodule.c
|
||||
SOURCE=..\Modules\_testcapimodule.c
|
||||
# End Source File
|
||||
# End Target
|
||||
# End Project
|
||||
|
|
@ -41,11 +41,14 @@ Package=<5>
|
|||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "_test"=.\_test.dsp - Package Owner=<4>
|
||||
Project: "_testcapi"=.\_testcapi.dsp - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
|
|
@ -53,6 +56,9 @@ Package=<5>
|
|||
|
||||
Package=<4>
|
||||
{{{
|
||||
Begin Project Dependency
|
||||
Project_Dep_Name pythoncore
|
||||
End Project Dependency
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
|
|
|||
|
|
@ -697,8 +697,8 @@ item: Install File
|
|||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
Source=%_SRC_%\PCbuild\_test.pyd
|
||||
Destination=%MAINDIR%\DLLs\_test.pyd
|
||||
Source=%_SRC_%\PCbuild\_testcapi.pyd
|
||||
Destination=%MAINDIR%\DLLs\_testcapi.pyd
|
||||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
|
|
@ -771,8 +771,8 @@ item: Install File
|
|||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
Source=%_SRC_%\PCbuild\_test.lib
|
||||
Destination=%MAINDIR%\libs\_test.lib
|
||||
Source=%_SRC_%\PCbuild\_testcapi.lib
|
||||
Destination=%MAINDIR%\libs\_testcapi.lib
|
||||
Flags=0000000000000010
|
||||
end
|
||||
item: Install File
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@ _sre
|
|||
Unicode-aware regular expression engine
|
||||
_symtable
|
||||
the _symtable module, symtablemodule.c
|
||||
_test
|
||||
_testcapi
|
||||
tests of the Python C API, run via Lib/test/test_capi.py, and
|
||||
implemented by module Modules/_testmodule.c
|
||||
implemented by module Modules/_testcapimodule.c
|
||||
mmap
|
||||
mmapmodule.c
|
||||
parser
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -176,7 +176,7 @@ class PyBuildExt(build_ext):
|
|||
# access to the builtin codecs and codec registry
|
||||
exts.append( Extension('_codecs', ['_codecsmodule.c']) )
|
||||
# Python C API test module
|
||||
exts.append( Extension('_test', ['_testmodule.c']) )
|
||||
exts.append( Extension('_testcapi', ['_testcapimodule.c']) )
|
||||
# static Unicode character database
|
||||
exts.append( Extension('unicodedata', ['unicodedata.c']) )
|
||||
# access to ISO C locale support
|
||||
|
|
|
|||
Loading…
Reference in New Issue