diff options
| -rw-r--r-- | lldb/test/linux/builtin_trap/TestBuiltinTrap.py | 1 | ||||
| -rw-r--r-- | lldb/test/lldbtest.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py index a81683c9063..0f09cffb784 100644 --- a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py +++ b/lldb/test/linux/builtin_trap/TestBuiltinTrap.py @@ -22,6 +22,7 @@ class BuiltinTrapTestCase(TestBase): @dwarf_test @expectedFailureAll("llvm.org/pr15936", compiler="gcc", compiler_version=["<=","4.6"]) + @expectedFailureAll(archs="arm", compiler="gcc", triple=".*-android") # gcc generates incorrect linetable def test_with_dwarf_and_run_command(self): """Test that LLDB handles a function with __builtin_trap correctly.""" self.buildDwarf() diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index 11949865349..dc2aeb2f301 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -641,11 +641,12 @@ def expectedFailureCompiler(compiler, compiler_version=None, bugnumber=None): # @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): +def expectedFailureAll(bugnumber=None, oslist=None, compiler=None, compiler_version=None, archs=None, triple=None): def fn(self): return ((oslist is None or self.getPlatform() in oslist) and (compiler is None or (compiler in self.getCompiler() and self.expectedCompilerVersion(compiler_version))) and - self.expectedArch(archs)) + self.expectedArch(archs) and + (triple is None or re.match(triple, lldb.DBG.GetSelectedPlatform().GetTriple()))) return expectedFailure(fn, bugnumber) # to XFAIL a specific clang versions, try this |
