diff options
author | Pavel Labath <labath@google.com> | 2016-01-06 14:15:32 +0000 |
---|---|---|
committer | Pavel Labath <labath@google.com> | 2016-01-06 14:15:32 +0000 |
commit | b5846ce7152683def6e97bb1362bfaa511a98c86 (patch) | |
tree | ebbefd067b18def815f6cabc21a1e2ad2bee1d3c /lldb/packages/Python/lldbsuite/test | |
parent | f4467cd1cd36b2325116a9e50c04cbdca16a5ec2 (diff) | |
download | bcm5719-llvm-b5846ce7152683def6e97bb1362bfaa511a98c86.tar.gz bcm5719-llvm-b5846ce7152683def6e97bb1362bfaa511a98c86.zip |
Remove XTIMEOUT from TestMultithreaded on linux
instead, mark the test as expected flaky, which will trigger a rerun in case the test hangs.
llvm-svn: 256935
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py | 1 | ||||
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/dosep.py | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py index 90660dbcee5..0b405091ebd 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py +++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py @@ -51,6 +51,7 @@ class SBBreakpointCallbackCase(TestBase): @skipIfNoSBHeaders @skipIfWindows # clang-cl does not support throw or catch (llvm.org/pr24538) @expectedFlakeyFreeBSD + @expectedFlakeyLinux def test_sb_api_listener_resume(self): """ Test that a process can be resumed from a non-main thread. """ self.build_and_test('driver.cpp listener_test.cpp test_listener_resume.cpp', diff --git a/lldb/packages/Python/lldbsuite/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py index d5242f643c8..51275d55c17 100644 --- a/lldb/packages/Python/lldbsuite/test/dosep.py +++ b/lldb/packages/Python/lldbsuite/test/dosep.py @@ -1144,11 +1144,7 @@ def getExpectedTimeouts(platform_name): expected_timeout = set() - if target.startswith("linux"): - expected_timeout |= { - "TestMultithreaded.py", - } - elif target.startswith("android"): + if target.startswith("android"): expected_timeout |= { "TestExitDuringStep.py", "TestHelloWorld.py", |