From 57cacb013f4c29ffab4e932f0543d9b05f32814b Mon Sep 17 00:00:00 2001 From: Todd Fiala Date: Thu, 10 Jul 2014 20:52:08 +0000 Subject: [PATCH] Flipped intermittent test failures from skip to XFAIL. The following intermittently-failing tests have been flipped from skip to XFAIL on some combo of Linux and MacOSX: TestCallStopAndContinue.py (Linux, MacOSX) TestCallWithTimeout.py (Linux) TestConvenienceVariables.py (Linux) TestStopHookMultipleThreads.py (Linux) The following new tests have been marked XFAIL but are just intermittently failing: TestMultipleDebug.py (definitely intermittent on MacOSX, not sure I've seen it pass yet on Linux) llvm-svn: 212762 --- lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py | 2 ++ .../expression_command/call-function/TestCallStopAndContinue.py | 6 +++--- lldb/test/expression_command/timeout/TestCallWithTimeout.py | 2 +- .../embedded_interpreter/TestConvenienceVariables.py | 2 +- .../stop-hook/multiple_threads/TestStopHookMultipleThreads.py | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py index 1684e35..4224001 100644 --- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py +++ b/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py @@ -16,6 +16,8 @@ class TestMultipleSimultaneousDebuggers(TestBase): self.lib_dir = os.environ["LLDB_LIB_DIR"] @skipIfi386 + @expectedFailureDarwin("llvm.org/pr20282") # intermittent + @expectedFailureLinux("llvm.org/pr20282") def test_multiple_debuggers(self): self.driver_exe = os.path.join(os.getcwd(), "multi-process-driver") diff --git a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py index d3bb94a..053eebf 100644 --- a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py +++ b/lldb/test/expression_command/call-function/TestCallStopAndContinue.py @@ -22,15 +22,15 @@ class ExprCommandCallStopContinueTestCase(TestBase): @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test - @skipIfDarwin # see llvm.org/pr20274 - intermittent failure on MacOSX + @expectedFailureDarwin("llvm.org/pr20274") # intermittent failure on MacOSX def test_with_dsym(self): """Test gathering result from interrupted function call.""" self.buildDsym() self.call_function() @dwarf_test - @skipIfDarwin # see llvm.org/pr20274 - intermittent failure on MacOSX - @skipIfLinux # see llvm.org/pr20274 - intermittent failure on Linux + @expectedFailureDarwin("llvm.org/pr20274") # intermittent failure on MacOSX + @expectedFailureLinux("llvm.org/pr20274") # intermittent failure on Linux def test_with_dwarf(self): """Test gathering result from interrupted function call.""" self.buildDwarf() diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/test/expression_command/timeout/TestCallWithTimeout.py index e3ed83d..aeb6834 100644 --- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py +++ b/lldb/test/expression_command/timeout/TestCallWithTimeout.py @@ -27,7 +27,7 @@ class ExprCommandWithTimeoutsTestCase(TestBase): self.call_function() @expectedFailureFreeBSD("llvm.org/pr19605") # fails on buildbot - @skipIfLinux # llvm.org/pr20275 - fails intermittently on Linux + @expectedFailureLinux("llvm.org/pr20275") # fails intermittently on Linux @dwarf_test def test_with_dwarf(self): """Test calling std::String member function.""" diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py index 1325483..6892610 100644 --- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py +++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py @@ -19,7 +19,7 @@ class ConvenienceVariablesCase(TestBase): @dwarf_test @skipIfFreeBSD # llvm.org/pr17228 - @skipIfLinux # llvm.org/pr20276 + @expectedFailureLinux("llvm.org/pr20276") # intermittent failure on Linux def test_with_dwarf_and_run_commands(self): """Test convenience variables lldb.debugger, lldb.target, lldb.process, lldb.thread, and lldb.frame.""" self.buildDwarf() diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py index 86410e4..7fd553a 100644 --- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py +++ b/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py @@ -21,7 +21,7 @@ class StopHookForMultipleThreadsTestCase(TestBase): self.stop_hook_multiple_threads() @dwarf_test - @skipIfLinux # llvm.org/pr15037 stop hooks sometimes fail to fire on Linux (cannot mark XFAIL, sometimes it passes) + @expectedFailureLinux("llvm.org/pr15037") # stop hooks sometimes fail to fire on Linux def test_stop_hook_multiple_threads_with_dwarf(self): """Test that lldb stop-hook works for multiple threads.""" self.buildDwarf(dictionary=self.d) -- 2.7.4