From 54b6e5f15f4069cb57c39665c8a701fcd7e3fe94 Mon Sep 17 00:00:00 2001 From: "SND\\kernelnet_cp" Date: Mon, 13 May 2013 12:34:37 +0000 Subject: [PATCH] [0.3.x] added : python unit tests git-svn-id: https://pykd.svn.codeplex.com/svn@83678 9b283d60-5439-405e-af05-b73fd8c4d996 --- pykd-0.3-2010.sln | 48 ++++++++++++++++++++++++++++++++++ pykd/pykd.vcxproj | 4 +++ pykd/pymod.cpp | 12 ++++----- pykd/targetver.h | 14 ++++++++++ test/scripts/_run_pykdtest.cmd | 2 +- test/scripts/pykdtest.py | 48 +++++++++++++++++----------------- 6 files changed, 97 insertions(+), 31 deletions(-) diff --git a/pykd-0.3-2010.sln b/pykd-0.3-2010.sln index 879d64a..cbe723c 100644 --- a/pykd-0.3-2010.sln +++ b/pykd-0.3-2010.sln @@ -2,9 +2,47 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pykd", "pykd\pykd.vcxproj", "{C4C45791-0201-4406-BC5C-A384B01E3BF5}" + ProjectSection(ProjectDependencies) = postProject + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF} = {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kdlib", "kdlibcpp\source\kdlib.vcxproj", "{3E9C538F-F060-4E86-AB7D-D44439615B63}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5A3C2DA6-AE91-4025-AC03-A58BD03CEBCD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{FE246107-1CB8-404F-97BD-E901E4B5E972}" + ProjectSection(SolutionItems) = preProject + test\scripts\_run_pykdtest.cmd = test\scripts\_run_pykdtest.cmd + test\scripts\basetest.py = test\scripts\basetest.py + test\scripts\clienttest.py = test\scripts\clienttest.py + test\scripts\customtypestest.py = test\scripts\customtypestest.py + test\scripts\dbgcmd.py = test\scripts\dbgcmd.py + test\scripts\diatest.py = test\scripts\diatest.py + test\scripts\ehexcepttest.py = test\scripts\ehexcepttest.py + test\scripts\ehloadtest.py = test\scripts\ehloadtest.py + test\scripts\ehstatustest.py = test\scripts\ehstatustest.py + test\scripts\ehsymbolstest.py = test\scripts\ehsymbolstest.py + test\scripts\eventtest.py = test\scripts\eventtest.py + test\scripts\intbase.py = test\scripts\intbase.py + test\scripts\localstest.py = test\scripts\localstest.py + test\scripts\memtest.py = test\scripts\memtest.py + test\scripts\moduletest.py = test\scripts\moduletest.py + test\scripts\mspdbtest.py = test\scripts\mspdbtest.py + test\scripts\pykdtest.py = test\scripts\pykdtest.py + test\scripts\regtest.py = test\scripts\regtest.py + test\scripts\synsymtest.py = test\scripts\synsymtest.py + test\scripts\target.py = test\scripts\target.py + test\scripts\testutils.py = test\scripts\testutils.py + test\scripts\thrdctxtest.py = test\scripts\thrdctxtest.py + test\scripts\typedvar.py = test\scripts\typedvar.py + test\scripts\typeinfo.py = test\scripts\typeinfo.py + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "targetapp", "kdlibcpp\tests\targetapp\targetapp.vcxproj", "{0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}" + ProjectSection(ProjectDependencies) = postProject + {3E9C538F-F060-4E86-AB7D-D44439615B63} = {3E9C538F-F060-4E86-AB7D-D44439615B63} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_2.7|Win32 = Debug_2.7|Win32 @@ -24,8 +62,18 @@ Global {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug|Win32.Build.0 = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release|Win32.ActiveCfg = Release|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release|Win32.Build.0 = Release|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release|Win32.ActiveCfg = Release|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FE246107-1CB8-404F-97BD-E901E4B5E972} = {5A3C2DA6-AE91-4025-AC03-A58BD03CEBCD} + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF} = {5A3C2DA6-AE91-4025-AC03-A58BD03CEBCD} + EndGlobalSection EndGlobal diff --git a/pykd/pykd.vcxproj b/pykd/pykd.vcxproj index bf380e6..842d8f6 100644 --- a/pykd/pykd.vcxproj +++ b/pykd/pykd.vcxproj @@ -54,6 +54,7 @@ true + .pyd false @@ -86,6 +87,9 @@ pykd.def $(PYTHON_27_X86_ROOT)\libs;$(BOOST_ROOT)\stage_2.7\lib;%(AdditionalLibraryDirectories) + + "$(ProjectDir)..\test\scripts\_run_pykdtest.cmd" "$(TargetDir)targetapp.exe" $(PlatformName) + diff --git a/pykd/pymod.cpp b/pykd/pymod.cpp index 634804b..a85b29d 100644 --- a/pykd/pymod.cpp +++ b/pykd/pymod.cpp @@ -34,11 +34,11 @@ using namespace kdlib; /////////////////////////////////////////////////////////////////////////////// -//static const std::string pykdVersion = PYKD_VERSION_BUILD_STR -//#ifdef _DEBUG -// " " -//#endif // _DEBUG -//; +static const std::string pykdVersion = PYKD_VERSION_BUILD_STR +#ifdef _DEBUG + " " +#endif // _DEBUG +; //////////////////////////////////////////////////////////////////////////////// // @@ -82,7 +82,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( dprintln_, dprintln, 1, 2 ); BOOST_PYTHON_MODULE( pykd ) { - // python::scope().attr("version") = pykdVersion; + python::scope().attr("version") = pykdVersion; // // DbgEng services // python::def( "setSymSrvDir", &setSymSrvDir, diff --git a/pykd/targetver.h b/pykd/targetver.h index 90e767b..f7fd655 100644 --- a/pykd/targetver.h +++ b/pykd/targetver.h @@ -6,3 +6,17 @@ // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. #include + + +#define PYKD_VERSION_MAJOR 0 +#define PYKD_VERSION_MINOR 3 +#define PYKD_VERSION_SUBVERSION 0 +#define PYKD_VERSION_BUILDNO 0 + +#define __VER_STR2__(x) #x +#define __VER_STR1__(x) __VER_STR2__(x) + +#define PYKD_VERSION_BUILD PYKD_VERSION_MAJOR, PYKD_VERSION_MINOR, PYKD_VERSION_SUBVERSION, PYKD_VERSION_BUILDNO + +#define PYKD_VERSION_BUILD_STR __VER_STR1__(PYKD_VERSION_BUILD) + diff --git a/test/scripts/_run_pykdtest.cmd b/test/scripts/_run_pykdtest.cmd index c8b0c14..33bca6a 100644 --- a/test/scripts/_run_pykdtest.cmd +++ b/test/scripts/_run_pykdtest.cmd @@ -11,7 +11,7 @@ if "%PROCESSOR_ARCHITECTURE%" == "x86" ( if not defined PROCESSOR_ARCHITEW6432 set Arch=x86 ) -set PythonRegKey=HKLM\Software\Python\PythonCore\2.6\InstallPath +set PythonRegKey=HKLM\Software\Python\PythonCore\2.7\InstallPath set RegSwitch=64 if "%TestAppPlatform%"=="Win32" set RegSwitch=32 diff --git a/test/scripts/pykdtest.py b/test/scripts/pykdtest.py index aa2535b..1c20f3a 100644 --- a/test/scripts/pykdtest.py +++ b/test/scripts/pykdtest.py @@ -13,18 +13,18 @@ import pykd import target -import intbase -import memtest -import moduletest -import typeinfo -import typedvar -import regtest -import mspdbtest -import localstest -import customtypestest -import ehexcepttest -import ehstatustest -import ehsymbolstest +#import intbase +#import memtest +#import moduletest +#import typeinfo +#import typedvar +#import regtest +#import mspdbtest +#import localstest +#import customtypestest +#import ehexcepttest +#import ehstatustest +#import ehsymbolstest class StartProcessWithoutParamsTest(unittest.TestCase): def testStart(self): @@ -45,21 +45,21 @@ def getTestSuite( singleName = "" ): [ unittest.TestLoader().loadTestsFromTestCase( StartProcessWithoutParamsTest ), # *** Test without start/kill new processes - unittest.TestLoader().loadTestsFromTestCase( intbase.IntBaseTest ), - unittest.TestLoader().loadTestsFromTestCase( moduletest.ModuleTest ), - unittest.TestLoader().loadTestsFromTestCase( memtest.MemoryTest ), - unittest.TestLoader().loadTestsFromTestCase( typeinfo.TypeInfoTest ), - unittest.TestLoader().loadTestsFromTestCase( typedvar.TypedVarTest ), - unittest.TestLoader().loadTestsFromTestCase( regtest.CpuRegTest ), - unittest.TestLoader().loadTestsFromTestCase( customtypestest.CustomTypesTest ), + #unittest.TestLoader().loadTestsFromTestCase( intbase.IntBaseTest ), + #unittest.TestLoader().loadTestsFromTestCase( moduletest.ModuleTest ), + #unittest.TestLoader().loadTestsFromTestCase( memtest.MemoryTest ), + #unittest.TestLoader().loadTestsFromTestCase( typeinfo.TypeInfoTest ), + #unittest.TestLoader().loadTestsFromTestCase( typedvar.TypedVarTest ), + #unittest.TestLoader().loadTestsFromTestCase( regtest.CpuRegTest ), + #unittest.TestLoader().loadTestsFromTestCase( customtypestest.CustomTypesTest ), # ^^^ unittest.TestLoader().loadTestsFromTestCase( TerminateProcessTest ), - unittest.TestLoader().loadTestsFromTestCase( mspdbtest.MsPdbTest ), - unittest.TestLoader().loadTestsFromTestCase( localstest.LocalVarsTest ), - unittest.TestLoader().loadTestsFromTestCase( ehexcepttest.EhExceptionTest ), - unittest.TestLoader().loadTestsFromTestCase( ehstatustest.EhStatusTest ), - unittest.TestLoader().loadTestsFromTestCase( ehsymbolstest.EhSymbolsTest ), + #unittest.TestLoader().loadTestsFromTestCase( mspdbtest.MsPdbTest ), + #unittest.TestLoader().loadTestsFromTestCase( localstest.LocalVarsTest ), + #unittest.TestLoader().loadTestsFromTestCase( ehexcepttest.EhExceptionTest ), + #unittest.TestLoader().loadTestsFromTestCase( ehstatustest.EhStatusTest ), + #unittest.TestLoader().loadTestsFromTestCase( ehsymbolstest.EhSymbolsTest ), ] ) else: return unittest.TestSuite(