mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Renamed _testXXX to _testcapiXXX. Jack is my hero -- good call!

Browse source
This commit is contained in:
Tim Peters 2001-02-04 03:09:53 +00:00
parent 693291ba23
commit d66595fe42
8 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_capi.py
View file

@ -1,16 +1,16 @@
# Run the _test module tests (tests for the Python/C API): by defn, these # Run the _testcapi module tests (tests for the Python/C API): by defn,
# are all functions _test exports whose name begins with 'test_'. # these are all functions _test exports whose name begins with 'test_'.
import sys import sys
import test_support import test_support
import _test import _testcapi
for name in dir(_test): for name in dir(_testcapi):
if name.startswith('test_'): if name.startswith('test_'):
test = getattr(_test, name) test = getattr(_testcapi, name)
if test_support.verbose: if test_support.verbose:
print "internal", name print "internal", name
try: try:
test() test()
except _test.error: except _testcapi.error:
raise test_support.TestFailed, sys.exc_info()[1] raise test_support.TestFailed, sys.exc_info()[1]

11
Misc/NEWS
View file

@ -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? What's New in Python 2.1 alpha 2?
================================= =================================

6
Modules/_testmodule.c → Modules/_testcapimodule.c
View file

@ -56,13 +56,13 @@ static PyMethodDef TestMethods[] = {
}; };
DL_EXPORT(void) DL_EXPORT(void)
init_test(void) init_testcapi(void)
{ {
PyObject *m, *d; 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); d = PyModule_GetDict(m);
PyDict_SetItemString(d, "error", TestError); PyDict_SetItemString(d, "error", TestError);
} }

32
PCbuild/_test.dsp → PCbuild/_testcapi.dsp
View file

@ -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 # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT ** # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 # 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 This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "_test.mak". !MESSAGE NMAKE /f "_testcapi.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "_test.mak" CFG="_test - Win32 Debug" !MESSAGE NMAKE /f "_testcapi.mak" CFG="_testcapi - Win32 Debug"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "_test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_testcapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "_test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "_testcapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "_test" # PROP Scc_ProjName "_testcapi"
# PROP Scc_LocalPath ".." # PROP Scc_LocalPath ".."
CPP=cl.exe CPP=cl.exe
MTL=midl.exe MTL=midl.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "_test - Win32 Release" !IF "$(CFG)" == "_testcapi - Win32 Release"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0 # PROP BASE Use_Debug_Libraries 0
@ -39,7 +39,7 @@ RSC=rc.exe
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "." # PROP Output_Dir "."
# PROP Intermediate_Dir "x86-temp-release\_test" # PROP Intermediate_Dir "x86-temp-release\_testcapi"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
F90=df.exe F90=df.exe
@ -54,10 +54,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_test - Win32 Debug" !ELSEIF "$(CFG)" == "_testcapi - Win32 Debug"
# PROP BASE Use_MFC 0 # PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1 # PROP BASE Use_Debug_Libraries 1
@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "." # PROP Output_Dir "."
# PROP Intermediate_Dir "x86-temp-debug\_test" # PROP Intermediate_Dir "x86-temp-debug\_testcapi"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
F90=df.exe F90=df.exe
@ -82,18 +82,18 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF
# Begin Target # Begin Target
# Name "_test - Win32 Release" # Name "_testcapi - Win32 Release"
# Name "_test - Win32 Debug" # Name "_testcapi - Win32 Debug"
# Begin Source File # Begin Source File
SOURCE=..\Modules\_testmodule.c SOURCE=..\Modules\_testcapimodule.c
# End Source File # End Source File
# End Target # End Target
# End Project # End Project

8
PCbuild/pcbuild.dsw
View file

@ -41,11 +41,14 @@ Package=<5>
Package=<4> 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> Package=<5>
{{{ {{{
@ -53,6 +56,9 @@ Package=<5>
Package=<4> Package=<4>
{{{ {{{
Begin Project Dependency
Project_Dep_Name pythoncore
End Project Dependency
}}} }}}
############################################################################### ###############################################################################

8
PCbuild/python20.wse
View file

@ -697,8 +697,8 @@ item: Install File
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File
Source=%_SRC_%\PCbuild\_test.pyd Source=%_SRC_%\PCbuild\_testcapi.pyd
Destination=%MAINDIR%\DLLs\_test.pyd Destination=%MAINDIR%\DLLs\_testcapi.pyd
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File
@ -771,8 +771,8 @@ item: Install File
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File
Source=%_SRC_%\PCbuild\_test.lib Source=%_SRC_%\PCbuild\_testcapi.lib
Destination=%MAINDIR%\libs\_test.lib Destination=%MAINDIR%\libs\_testcapi.lib
Flags=0000000000000010 Flags=0000000000000010
end end
item: Install File item: Install File

4
PCbuild/readme.txt
View file

@ -45,9 +45,9 @@ _sre
Unicode-aware regular expression engine Unicode-aware regular expression engine
_symtable _symtable
the _symtable module, symtablemodule.c the _symtable module, symtablemodule.c
_test _testcapi
tests of the Python C API, run via Lib/test/test_capi.py, and 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 mmap
mmapmodule.c mmapmodule.c
parser parser

2
setup.py
View file

@ -176,7 +176,7 @@ class PyBuildExt(build_ext):
# access to the builtin codecs and codec registry # access to the builtin codecs and codec registry
exts.append( Extension('_codecs', ['_codecsmodule.c']) ) exts.append( Extension('_codecs', ['_codecsmodule.c']) )
# Python C API test module # Python C API test module
exts.append( Extension('_test', ['_testmodule.c']) ) exts.append( Extension('_testcapi', ['_testcapimodule.c']) )
# static Unicode character database # static Unicode character database
exts.append( Extension('unicodedata', ['unicodedata.c']) ) exts.append( Extension('unicodedata', ['unicodedata.c']) )
# access to ISO C locale support # access to ISO C locale support