From 1b306c26ade71504511d2fa75b03dfaee77f9620 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 1 Jul 2017 13:24:58 +0000 Subject: Vendor import of lldb trunk r306956: https://llvm.org/svn/llvm-project/lldb/trunk@306956 --- .../test/functionalities/return-value/TestReturnValue.py | 14 ++------------ packages/Python/lldbsuite/test/make/Android.rules | 4 ++++ 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'packages/Python/lldbsuite/test') diff --git a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py index e476c48d18443..cf435a4aae911 100644 --- a/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py +++ b/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py @@ -31,12 +31,8 @@ class ReturnValueTestCase(TestBase): "<=", "3.6"], archs=["i386"]) - @expectedFailureAll( - bugnumber="llvm.org/pr25785", - hostoslist=["windows"], - compiler="gcc", - archs=["i386"], - triple='.*-android') + @expectedFailureAll(compiler="clang", compiler_version=["<=", "5.0.300080"], + triple='.*-android', archs=["i386"]) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778") @add_test_categories(['pyapi']) def test_with_python(self): @@ -185,12 +181,6 @@ class ReturnValueTestCase(TestBase): "<=", "3.6"], archs=["i386"]) - @expectedFailureAll( - bugnumber="llvm.org/pr25785", - hostoslist=["windows"], - compiler="gcc", - archs=["i386"], - triple='.*-android') @expectedFailureAll(compiler=["gcc"], archs=["x86_64", "i386"]) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778") def test_vector_values(self): diff --git a/packages/Python/lldbsuite/test/make/Android.rules b/packages/Python/lldbsuite/test/make/Android.rules index 058401f425ad7..0a725494d3542 100644 --- a/packages/Python/lldbsuite/test/make/Android.rules +++ b/packages/Python/lldbsuite/test/make/Android.rules @@ -90,3 +90,7 @@ else ARCH_LDFLAGS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a endif + +ifeq "$(ARCH)" "i386" + ARCH_CFLAGS += -mstackrealign +endif -- cgit v1.2.3