summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py14
-rw-r--r--lldb/packages/Python/lldbsuite/test/make/Android.rules4
2 files changed, 6 insertions, 12 deletions
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 e476c48d184..cf435a4aae9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/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/lldb/packages/Python/lldbsuite/test/make/Android.rules b/lldb/packages/Python/lldbsuite/test/make/Android.rules
index 058401f425a..0a725494d35 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Android.rules
+++ b/lldb/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
OpenPOWER on IntegriCloud