diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py index 16ff565..a457d13 100644 --- a/test/scripts/moduletest.py +++ b/test/scripts/moduletest.py @@ -78,11 +78,11 @@ class ModuleTest( unittest.TestCase ): fileName = pykd.getSourceFile(target.module.FuncWithName0 ) self.assertTrue( re.search('targetapp\\.cpp', fileName ) ) fileName, lineNo, displacement = pykd.getSourceLine( target.module.FuncWithName0 + 2) - self.assertEqual( 413, lineNo ) + self.assertEqual( 421, lineNo ) self.assertTrue( re.search('targetapp\\.cpp', fileName ) ) self.assertEqual( 2, displacement ) fileName, lineNo, displacement = pykd.getSourceLine() - self.assertEqual( 689, lineNo ) + self.assertEqual( 698, lineNo ) def testEnumSymbols( self ): lst = target.module.enumSymbols() diff --git a/test/scripts/pykdtest.py b/test/scripts/pykdtest.py index 82be89d..aa2535b 100644 --- a/test/scripts/pykdtest.py +++ b/test/scripts/pykdtest.py @@ -77,7 +77,5 @@ if __name__ == "__main__": target.moduleName = os.path.splitext(os.path.basename(target.appPath))[0] unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( getTestSuite() ) - - #unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run( getTestSuite("moduletest.ModuleTest.testFindSymbol") ) - - raw_input() + + diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py index c73a950..bcd65fb 100644 --- a/test/scripts/typedvar.py +++ b/test/scripts/typedvar.py @@ -141,6 +141,10 @@ class TypedVarTest( unittest.TestCase ): self.assertEqual( 4, tv.m_bit0_4 ) self.assertEqual( 1, tv.m_bit5 ) self.assertEqual( 3, tv.m_bit6_7 ) + tv = target.module.typedVar("g_structWithSignBits") + self.assertEqual( 4, tv.m_bit0_4 ) + self.assertEqual( -1, tv.m_bit5 ) + self.assertEqual( -1, tv.m_bit6_7 ) def testTypedVarList(self): tvl = target.module.typedVarList( target.module.g_listHead, "listStruct", "listEntry" ) diff --git a/test/targetapp/targetapp.cpp b/test/targetapp/targetapp.cpp index 9cea268..1b78e62 100644 --- a/test/targetapp/targetapp.cpp +++ b/test/targetapp/targetapp.cpp @@ -47,6 +47,13 @@ struct structWithBits { ULONG m_bit6_7 : 2; }; +struct structWitSignBits { + LONG m_bit0_4 : 5; + LONG m_bit5 : 1; + LONG m_bit6_7 : 2; +}; + + union unionTest { ULONG m_value; @@ -98,6 +105,7 @@ typedef struct structAbstract *pstructAbstract; pstructAbstract g_structAbstract = 0; structWithBits g_structWithBits = { 4, 1, 3}; +structWitSignBits g_structWithSignBits = { 4, 1, 3 }; structTest g_structTest = { 0, 500, true, 1, NULL }; structTest g_structTest1 = { 0, 500, true, 1, &g_structTest }; @@ -450,6 +458,7 @@ void FuncWithName0() std::cout << (*ptrIntMatrix)[0][1]; std::cout << g_struct3.m_noArrayField; std::cout << g_structWithBits.m_bit5; + std::cout << g_structWithSignBits.m_bit5; std::cout << ptrStrArray; std::cout << g_structTest1.m_field2; std::cout << ptrIntMatrix1;