From 7ead0b937c7b4cd43d8f0b454fb8c1e76e2d5825 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 9 Dec 2015 10:54:18 +0000 Subject: XFAIL TestReturnValue for remote Windows->Android tests this also adds the ability to match the host platform to the expectedFailureAll decorator. llvm-svn: 255105 --- .../lldbsuite/test/functionalities/return-value/TestReturnValue.py | 1 + lldb/packages/Python/lldbsuite/test/lldbtest.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite') diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py index fad932cf3d0..01e105cdf1b 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py @@ -18,6 +18,7 @@ class ReturnValueTestCase(TestBase): @expectedFailureAll(oslist=["macosx","freebsd"], archs=["i386"]) @expectedFailureAll(oslist=["linux"], compiler="clang", compiler_version=["<=", "3.6"], archs=["i386"]) + @expectedFailureAll(bugnumber="llvm.org/pr25785", oslist=["android"], hostoslist=["windows"], compiler="gcc", archs=["i386"]) @expectedFailureWindows("llvm.org/pr24778") @add_test_categories(['pyapi']) def test_with_python(self): diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index f45f00f4a5c..7f7760b9859 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -662,9 +662,10 @@ def check_list_or_lambda (list_or_lambda, value): # @expectedFailureAll, xfail for all platform/compiler/arch, # @expectedFailureAll(compiler='gcc'), xfail for gcc on all platform/architecture # @expectedFailureAll(bugnumber, ["linux"], "gcc", ['>=', '4.9'], ['i386']), xfail for gcc>=4.9 on linux with i386 -def expectedFailureAll(bugnumber=None, oslist=None, compiler=None, compiler_version=None, archs=None, triple=None, debug_info=None, swig_version=None, py_version=None): +def expectedFailureAll(bugnumber=None, oslist=None, hostoslist=None, compiler=None, compiler_version=None, archs=None, triple=None, debug_info=None, swig_version=None, py_version=None): def fn(self): oslist_passes = check_list_or_lambda(oslist, self.getPlatform()) + hostoslist_passes = check_list_or_lambda(hostoslist, getHostPlatform()) compiler_passes = check_list_or_lambda(self.getCompiler(), compiler) and self.expectedCompilerVersion(compiler_version) arch_passes = self.expectedArch(archs) triple_passes = triple is None or re.match(triple, lldb.DBG.GetSelectedPlatform().GetTriple()) @@ -673,6 +674,7 @@ def expectedFailureAll(bugnumber=None, oslist=None, compiler=None, compiler_vers py_version_passes = (py_version is None) or check_expected_version(py_version[0], py_version[1], sys.version_info) return (oslist_passes and + hostoslist_passes and compiler_passes and arch_passes and triple_passes and -- cgit v1.2.3