[Lldb-commits] [lldb] r187730 - Additional fixes/xfails for icc tests

[Andrew Kaylor]

Author: akaylor
Date: Mon Aug  5 12:12:35 2013
New Revision: 187730

URL: http://llvm.org/viewvc/llvm-project?rev=187730&view=rev
Log:
Additional fixes/xfails for icc tests

Modified:
    lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
    lldb/trunk/test/functionalities/return-value/TestReturnValue.py
    lldb/trunk/test/lang/c/struct_types/TestStructTypes.py

Modified: lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py?rev=187730&r1=187729&r2=187730&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py (original)
+++ lldb/trunk/test/functionalities/inline-stepping/TestInlineStepping.py Mon Aug  5 12:12:35 2013
@@ -20,6 +20,7 @@ class TestInlineStepping(TestBase):
 
     @python_api_test
     @dwarf_test
+    @expectedFailureIcc # Not really a bug.  ICC combines two inlined functions.
     def test_with_dwarf_and_python_api(self):
         """Test stepping over and into inlined functions."""
         self.buildDwarf()

Modified: lldb/trunk/test/functionalities/return-value/TestReturnValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/return-value/TestReturnValue.py?rev=187730&r1=187729&r2=187730&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/return-value/TestReturnValue.py (original)
+++ lldb/trunk/test/functionalities/return-value/TestReturnValue.py Mon Aug  5 12:12:35 2013
@@ -211,8 +211,10 @@ class ReturnValueTestCase(TestBase):
         #self.return_and_test_struct_value ("return_one_int_one_double_packed")
         self.return_and_test_struct_value ("return_one_int_one_long")
 
-        self.return_and_test_struct_value ("return_vector_size_float32")
-        self.return_and_test_struct_value ("return_ext_vector_size_float32")
+        # icc and gcc don't support this extension.
+        if self.getCompiler().endswith('clang'):
+            self.return_and_test_struct_value ("return_vector_size_float32")
+            self.return_and_test_struct_value ("return_ext_vector_size_float32")
 
         
 if __name__ == '__main__':

Modified: lldb/trunk/test/lang/c/struct_types/TestStructTypes.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/struct_types/TestStructTypes.py?rev=187730&r1=187729&r2=187730&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/struct_types/TestStructTypes.py (original)
+++ lldb/trunk/test/lang/c/struct_types/TestStructTypes.py Mon Aug  5 12:12:35 2013
@@ -23,6 +23,9 @@ class StructTypesTestCase(TestBase):
         self.struct_types()
 
     # rdar://problem/12566646
+    @expectedFailureIcc # llvm.org/pr16793
+                        # ICC generates DW_AT_byte_size zero with a zero-length 
+                        # array and LLDB doesn't process it correctly.
     @dwarf_test
     def test_with_dwarf(self):
         """Test that break on a struct declaration has no effect."""
@@ -75,14 +78,14 @@ class StructTypesTestCase(TestBase):
         # Test zero length array access and make sure it succeeds with "frame variable"
         self.expect("frame variable pt.padding[0]",
             DATA_TYPES_DISPLAYED_CORRECTLY,
-            substrs = ["pt.padding[0] = '"])
+            substrs = ["pt.padding[0] = "])
         self.expect("frame variable pt.padding[1]",
             DATA_TYPES_DISPLAYED_CORRECTLY,
-            substrs = ["pt.padding[1] = '"])
+            substrs = ["pt.padding[1] = "])
         # Test zero length array access and make sure it succeeds with "expression"
         self.expect("expression -- (pt.padding[0])",
             DATA_TYPES_DISPLAYED_CORRECTLY,
-            substrs = ["(char)", " = '"])
+            substrs = ["(char)", " = "])
 
         # The padding should be an array of size 0
         self.expect("image lookup -t point_tag",