Modified some test annotations so that tests on Linux that should be skipped don't show up as XFAIL.

The following two tests showed up as XFAIL even though they should
always be skipped on Linux, due to the @unittest2.expectedFailure
annotation appearing above the @dsym_test annotation:

TestObjCNewSyntax.ObjCNewSyntaxTestCase.test_expr_with_dsym
TestBlocks.BlocksTestCase.test_expr_with_dsym.

For those two, I simply moved the @dsym_test annotation to the top so
that it would be marked for skip ahead of being marked for XFAIL.

TestObjCNewSyntax.ObjCNewSyntaxTestCase.test_expr_with_dwarf I marked
as @skipIfLinux since my understanding is that isn't a valid test to
run on Linux. So rather than categorize as a fail (i.e. something
wrong to be fixed), just skip it. (My recent changes to Linux tests
have been following that model: if it could never work, skip; if it's
broken, mark XFAIL so we can easily track, fix, notice the fix and
adjust accordingly).

TestDeadStrip.DeadStripTestCase.test_with_dwarf I had previously
marked as XFAIL but this would never work on Linux with the current
linker AFAICT.  Marked it as skip.

llvm-svn: 202788
This commit is contained in:
Todd Fiala 2014-03-04 05:28:24 +00:00
parent fd3cb9e37f
commit c25fd190ef
3 changed files with 5 additions and 4 deletions

View File

@ -20,7 +20,7 @@ class DeadStripTestCase(TestBase):
self.dead_strip()
@skipIfFreeBSD # The -dead_strip linker option isn't supported on FreeBSD versions of ld.
@expectedFailureLinux # The -dead_strip linker option isn't supported on Linux versions of ld.
@skipIfLinux # The -dead_strip linker option isn't supported on Linux versions of ld.
@dwarf_test
def test_with_dwarf(self):
"""Test breakpoint works correctly with dead-code stripping."""

View File

@ -11,8 +11,8 @@ class BlocksTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
lines = []
@unittest2.expectedFailure
@dsym_test
@unittest2.expectedFailure
def test_expr_with_dsym(self):
self.buildDsym()
self.expr()

View File

@ -14,14 +14,15 @@ class ObjCNewSyntaxTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@unittest2.expectedFailure
@dsym_test
@unittest2.expectedFailure
def test_expr_with_dsym(self):
self.buildDsym()
self.expr()
@unittest2.expectedFailure
@dwarf_test
@skipIfLinux
@unittest2.expectedFailure
def test_expr_with_dwarf(self):
self.buildDwarf()
self.expr()