From c25fd190ef5ca173bc53140c7f705e3f659d2d7d Mon Sep 17 00:00:00 2001
From: Todd Fiala <tfiala@google.com>
Date: Tue, 4 Mar 2014 05:28:24 +0000
Subject: [PATCH] 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
---
 lldb/test/functionalities/dead-strip/TestDeadStrip.py    | 2 +-
 lldb/test/lang/c/blocks/TestBlocks.py                    | 2 +-
 lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/functionalities/dead-strip/TestDeadStrip.py
index e0fbfb35f323..1371953b32f6 100644
--- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/functionalities/dead-strip/TestDeadStrip.py
@@ -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."""
diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/test/lang/c/blocks/TestBlocks.py
index 85f3e644466c..9f3d806778f7 100644
--- a/lldb/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/test/lang/c/blocks/TestBlocks.py
@@ -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()
diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index b3dcafc9b2db..21717b04347b 100644
--- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
@@ -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()