[Lldb-commits] [lldb] r255105 - XFAIL TestReturnValue for remote Windows->Android tests

[Pavel Labath via lldb-commits]

Author: labath
Date: Wed Dec  9 04:54:18 2015
New Revision: 255105

URL: http://llvm.org/viewvc/llvm-project?rev=255105&view=rev
Log:
XFAIL TestReturnValue for remote Windows->Android tests

this also adds the ability to match the host platform to the expectedFailureAll decorator.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
    lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py?rev=255105&r1=255104&r2=255105&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py Wed Dec  9 04:54:18 2015
@@ -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):

Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=255105&r1=255104&r2=255105&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Wed Dec  9 04:54:18 2015
@@ -662,9 +662,10 @@ def check_list_or_lambda (list_or_lambda
 # @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, o
         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