From 72b8f058789fbd4d46be300609018de260002a7f Mon Sep 17 00:00:00 2001 From: Chaoren Lin Date: Tue, 3 Feb 2015 01:51:18 +0000 Subject: [PATCH] Mark several tests as XFAIL with new expectedFailureLLGS decorator since they are failing in Darwin for the same reason. llvm-svn: 227925 --- .../functionalities/thread/break_after_join/TestBreakAfterJoin.py | 1 + .../thread/create_during_step/TestCreateDuringStep.py | 3 +++ .../functionalities/thread/exit_during_break/TestExitDuringBreak.py | 1 + .../functionalities/thread/exit_during_step/TestExitDuringStep.py | 3 +++ .../functionalities/thread/multi_break/TestMultipleBreakpoints.py | 1 + lldb/test/functionalities/thread/state/TestThreadStates.py | 3 ++- lldb/test/lldbtest.py | 5 +++++ 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py index 1b28578..a5e578a 100644 --- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ b/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -22,6 +22,7 @@ class BreakpointAfterJoinTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_with_dwarf(self): """Test breakpoint handling after a thread join.""" diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py index e98c19b..6acd643 100644 --- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py +++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py @@ -38,6 +38,7 @@ class CreateDuringStepTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_step_inst_with_dwarf(self): """Test thread creation during step-inst handling.""" @@ -46,6 +47,7 @@ class CreateDuringStepTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_step_over_with_dwarf(self): """Test thread creation during step-over handling.""" @@ -54,6 +56,7 @@ class CreateDuringStepTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_step_in_with_dwarf(self): """Test thread creation during step-in handling.""" diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py index 8d832fd..378ad28 100644 --- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ b/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -22,6 +22,7 @@ class ExitDuringBreakpointTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_with_dwarf(self): """Test thread exit during breakpoint handling.""" diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py index 676d42e..1c8e304 100644 --- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py +++ b/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py @@ -22,6 +22,7 @@ class ExitDuringStepTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_thread_state_is_stopped_with_dwarf(self): """Test thread exit during step handling.""" @@ -57,6 +58,7 @@ class ExitDuringStepTestCase(TestBase): self.exit_during_step_inst_test() @skipIfFreeBSD # llvm.org/pr21411: test is hanging + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_step_over_with_dwarf(self): """Test thread exit during step-over handling.""" @@ -64,6 +66,7 @@ class ExitDuringStepTestCase(TestBase): self.exit_during_step_over_test() @skipIfFreeBSD # llvm.org/pr21411: test is hanging + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_step_in_with_dwarf(self): """Test thread exit during step-in handling.""" diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py index d3a627b..52cb196 100644 --- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py +++ b/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py @@ -22,6 +22,7 @@ class MultipleBreakpointTestCase(TestBase): @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test def test_with_dwarf(self): """Test simultaneous breakpoints in multiple threads.""" diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/test/functionalities/thread/state/TestThreadStates.py index 4209893..b61d9fb 100644 --- a/lldb/test/functionalities/thread/state/TestThreadStates.py +++ b/lldb/test/functionalities/thread/state/TestThreadStates.py @@ -20,9 +20,10 @@ class ThreadStateTestCase(TestBase): self.buildDsym(dictionary=self.getBuildFlags(use_cpp11=False)) self.thread_state_after_breakpoint_test() + @expectedFailureDarwin("rdar://15367566") @expectedFailureFreeBSD('llvm.org/pr15824') + @expectedFailureLLGS("llvm.org/pr15824") # thread states not properly maintained @dwarf_test - @expectedFailureDarwin("rdar://15367566") def test_state_after_breakpoint_with_dwarf(self): """Test thread state after breakpoint.""" self.buildDwarf(dictionary=self.getBuildFlags(use_cpp11=False)) diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index 9c96018..691c66b 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -519,6 +519,11 @@ def expectedFailureLinux(bugnumber=None, compilers=None): def expectedFailureWindows(bugnumber=None, compilers=None): if bugnumber: return expectedFailureOS('win32', bugnumber, compilers) +def expectedFailureLLGS(bugnumber=None, compilers=None): + def fn(self): + return 'PLATFORM_LINUX_FORCE_LLGS_LOCAL' in os.environ and self.expectedCompiler(compilers) + if bugnumber: return expectedFailure(fn, bugnumber) + def skipIfRemote(func): """Decorate the item to skip tests if testing remotely.""" if isinstance(func, type) and issubclass(func, unittest2.TestCase): -- 2.7.4