Additional fixes/xfails for icc tests

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187730 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/functionalities/inline-stepping/TestInlineStepping.py b/test/functionalities/inline-stepping/TestInlineStepping.py
index 379fc3a..16ee80f 100644
--- a/test/functionalities/inline-stepping/TestInlineStepping.py
+++ b/test/functionalities/inline-stepping/TestInlineStepping.py
@@ -20,6 +20,7 @@
 
     @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()
diff --git a/test/functionalities/return-value/TestReturnValue.py b/test/functionalities/return-value/TestReturnValue.py
index f5673e2..c520c50 100644
--- a/test/functionalities/return-value/TestReturnValue.py
+++ b/test/functionalities/return-value/TestReturnValue.py
@@ -211,8 +211,10 @@
         #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__':
diff --git a/test/lang/c/struct_types/TestStructTypes.py b/test/lang/c/struct_types/TestStructTypes.py
index e716a69..b983513 100644
--- a/test/lang/c/struct_types/TestStructTypes.py
+++ b/test/lang/c/struct_types/TestStructTypes.py
@@ -23,6 +23,9 @@
         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 @@
         # 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",