[Lldb-commits] [lldb] r181840 - Fixed the test case to pass on Darwin. This might pass on linux as well. The test case now properly validates g_points as a global for the class A version, and the static variable for the file static.

[Greg Clayton]

Author: gclayton
Date: Tue May 14 17:17:29 2013
New Revision: 181840

URL: http://llvm.org/viewvc/llvm-project?rev=181840&view=rev
Log:
Fixed the test case to pass on Darwin. This might pass on linux as well. The test case now properly validates g_points as a global for the class A version, and the static variable for the file static.


Modified:
    lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py

Modified: lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py?rev=181840&r1=181839&r2=181840&view=diff
==============================================================================
--- lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py (original)
+++ lldb/trunk/test/lang/cpp/class_static/TestStaticVariables.py Tue May 14 17:17:29 2013
@@ -27,7 +27,6 @@ class StaticVariableTestCase(TestBase):
         self.static_variable_commands()
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
-    @expectedFailureClang(9980907)
     @expectedFailureGcc(9980907)
     @python_api_test
     @dsym_test
@@ -36,7 +35,6 @@ class StaticVariableTestCase(TestBase):
         self.buildDsym()
         self.static_variable_python()
 
-    @expectedFailureClang(9980907)
     @expectedFailureGcc(9980907)
     @python_api_test
     @dwarf_test
@@ -108,13 +106,14 @@ class StaticVariableTestCase(TestBase):
 
         for val in valList:
             self.DebugSBValue(val)
-            self.assertTrue(val.GetValueType() == lldb.eValueTypeVariableGlobal)
             name = val.GetName()
             self.assertTrue(name in ['g_points', 'A::g_points'])
             if name == 'g_points':
+                self.assertTrue(val.GetValueType() == lldb.eValueTypeVariableStatic)
                 self.assertTrue(val.GetNumChildren() == 2)
             elif name == 'A::g_points' and self.getCompiler() in ['clang', 'llvm-gcc']:
                 # On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points.        
+                self.assertTrue(val.GetValueType() == lldb.eValueTypeVariableGlobal)
                 self.assertTrue(val.GetNumChildren() == 2)
                 child1 = val.GetChildAtIndex(1)
                 self.DebugSBValue(child1)