From b76161e41bc2c07cd47f9c61f875d1be95e26d10 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 16 May 2017 19:47:58 +0000 Subject: Vendor import of lldb trunk r303197: https://llvm.org/svn/llvm-project/lldb/trunk@303197 --- .../lldbsuite/test/functionalities/return-value/TestReturnValue.py | 7 ++++++- .../variable_out_of_scope/TestWatchedVarHitWhenInScope.py | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'packages/Python/lldbsuite/test/functionalities') diff --git a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py index 90562f52a4b2..e476c48d1844 100644 --- a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py +++ b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py @@ -18,6 +18,10 @@ class ReturnValueTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) + def affected_by_pr33042(self): + return ("clang" in self.getCompiler() and self.getArchitecture() == + "aarch64" and self.getPlatform() == "linux") + @expectedFailureAll(oslist=["freebsd"], archs=["i386"]) @expectedFailureAll(oslist=["macosx"], archs=["i386"], bugnumber="") @expectedFailureAll( @@ -148,7 +152,8 @@ class ReturnValueTestCase(TestBase): self.return_and_test_struct_value("return_two_int") self.return_and_test_struct_value("return_three_int") self.return_and_test_struct_value("return_four_int") - self.return_and_test_struct_value("return_five_int") + if not self.affected_by_pr33042(): + self.return_and_test_struct_value("return_five_int") self.return_and_test_struct_value("return_two_double") self.return_and_test_struct_value("return_one_double_two_float") diff --git a/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py index d30741497635..47454498e70e 100644 --- a/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py +++ b/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py @@ -11,6 +11,7 @@ import time import lldb from lldbsuite.test.lldbtest import * import lldbsuite.test.lldbutil as lldbutil +from lldbsuite.test.decorators import * class WatchedVariableHitWhenInScopeTestCase(TestBase): @@ -33,6 +34,8 @@ class WatchedVariableHitWhenInScopeTestCase(TestBase): self.exe_name = self.testMethodName self.d = {'C_SOURCES': self.source, 'EXE': self.exe_name} + # Test hangs due to a kernel bug, see fdfeff0f in the linux kernel for details + @skipIfTargetAndroid(api_levels=list(range(25+1)), archs=["aarch64", "arm"]) @unittest2.expectedFailure("rdar://problem/18685649") def test_watched_var_should_only_hit_when_in_scope(self): """Test that a variable watchpoint should only hit when in scope.""" -- cgit v1.2.3