diff --git a/test/scripts/moduletest.py b/test/scripts/moduletest.py index b0535e8..9f41849 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( 400, lineNo ) + self.assertEqual( 404, lineNo ) self.assertTrue( re.search('targetapp\\.cpp', fileName ) ) self.assertEqual( 2, displacement ) fileName, lineNo, displacement = pykd.getSourceLine() - self.assertEqual( 673, lineNo ) + self.assertEqual( 677, lineNo ) def testEnumSymbols( self ): lst = target.module.enumSymbols() diff --git a/test/scripts/typeinfo.py b/test/scripts/typeinfo.py index a39bb6a..04d23f0 100644 --- a/test/scripts/typeinfo.py +++ b/test/scripts/typeinfo.py @@ -167,6 +167,7 @@ class TypeInfoTest( unittest.TestCase ): ti = target.module.type("StructWithNested") self.assertTrue( hasattr( ti, "m_field" ) ) self.assertFalse( hasattr( ti, "m_nestedFiled" ) ) + self.assertFalse( hasattr( ti, "m_field2" ) ) ti = target.module.type("StructWithNested::Nested") self.assertTrue( hasattr( ti, "m_nestedFiled" ) ) diff --git a/test/targetapp/targetapp.cpp b/test/targetapp/targetapp.cpp index d8e48bc..d802b2c 100644 --- a/test/targetapp/targetapp.cpp +++ b/test/targetapp/targetapp.cpp @@ -275,6 +275,10 @@ struct StructWithNested { int m_nestedFiled; }; int m_field; + + struct { + int m_field2; + }; }; StructWithNested g_structWithNested;