Mark some tests as explicitly failing on clang/gcc as they pass on icc.
Also, rework the signed types test to check for signed or char type in the output as char is signed by default.


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187533 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/lang/cpp/class_static/TestStaticVariables.py b/test/lang/cpp/class_static/TestStaticVariables.py
index 65645aa..bf7d962 100644
--- a/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/test/lang/cpp/class_static/TestStaticVariables.py
@@ -19,7 +19,8 @@
         self.buildDsym()
         self.static_variable_commands()
 
-    @expectedFailureLinux # llvm.org/pr15261: lldb on Linux does not display the size of (class or file)static arrays
+    @expectedFailureClang # llvm.org/pr15261: lldb on Linux does not display the size of (class or file)static arrays
+    @expectedFailureGcc # llvm.org/pr15261: lldb on Linux does not display the size of (class or file)static arrays
     @dwarf_test
     def test_with_dwarf_and_run_command(self):
         """Test that file and class static variables display correctly."""
diff --git a/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 9bc4c75..57612d5 100644
--- a/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -21,7 +21,8 @@
 
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr14540')
-    @expectedFailureLinux # due to llvm.org/pr14540
+    @expectedFailureClang # due to llvm.org/pr14540
+    @expectedFailureGcc # due to llvm.org/pr14540
     def test_with_dwarf_and_run_command(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.buildDwarf()
@@ -38,7 +39,8 @@
     @python_api_test
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr14540')
-    @expectedFailureLinux # due to llvm.org/pr14540
+    @expectedFailureClang # due to llvm.org/pr14540
+    @expectedFailureGcc # due to llvm.org/pr14540
     def test_with_dwarf_and_python_api(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.buildDwarf()
diff --git a/test/lang/cpp/signed_types/TestSignedTypes.py b/test/lang/cpp/signed_types/TestSignedTypes.py
index ebc2c3e..e9de2d9 100644
--- a/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -55,9 +55,9 @@
 
         # Test that signed types display correctly.
         self.expect("frame variable --show-types --no-args", VARIABLES_DISPLAYED_CORRECTLY,
-            patterns = ["\((short int|short)\) the_signed_short = 99"],
-            substrs = ["(signed char) the_signed_char = 'c'",
-                       "(int) the_signed_int = 99",
+            patterns = ["\((short int|short)\) the_signed_short = 99",
+                       "\((signed char|char)\) the_signed_char = 'c'"],
+            substrs = ["(int) the_signed_int = 99",
                        "(long) the_signed_long = 99",
                        "(long long) the_signed_long_long = 99"])