Add decorator support for the DWARF version produced by the compiler

and mark up some tests failing in
  http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake-matrix/

llvm-svn: 352072

2 files changed, 9 insertions, 0 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index b6bb2e8f309..d0913872416 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -16,6 +16,7 @@ class CPP11EnumTypesTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_int8_t(self):
         """Test C++11 enumeration class types as int8_t types."""
         self.build(
@@ -24,6 +25,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_int16_t(self):
         """Test C++11 enumeration class types as int16_t types."""
         self.build(
@@ -32,6 +34,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_int32_t(self):
         """Test C++11 enumeration class types as int32_t types."""
         self.build(
@@ -40,6 +43,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_int64_t(self):
         """Test C++11 enumeration class types as int64_t types."""
         self.build(
@@ -48,6 +52,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_uint8_t(self):
         """Test C++11 enumeration class types as uint8_t types."""
         self.build(
@@ -56,6 +61,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_uint16_t(self):
         """Test C++11 enumeration class types as uint16_t types."""
         self.build(
@@ -64,6 +70,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_uint32_t(self):
         """Test C++11 enumeration class types as uint32_t types."""
         self.build(
@@ -72,6 +79,7 @@ class CPP11EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr36527')
+    @skipIf(dwarf_version=['<', '4'])
     def test_uint64_t(self):
         """Test C++11 enumeration class types as uint64_t types."""
         self.build(
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py
index 8f2ab56488f..08132702b8d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/template/TestTemplateArgs.py
@@ -113,6 +113,7 @@ class TemplateArgsTestCase(TestBase):
     # Gcc does not generate the necessary DWARF attribute for enum template
     # parameters.
     @expectedFailureAll(bugnumber="llvm.org/pr28354", compiler="gcc")
+    @skipIf(dwarf_version=['<', '4'])
     def test_enum_args(self):
         frame = self.prepareProcess()