[PATCH] D64118: [lldb_test_suite] Fix lldb test suite targeting remote Android
Alex Langford via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 9 14:39:38 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL365561: [lldb_test_suite] Fix lldb test suite targeting remote Android (authored by xiaobai, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
Changed prior to commit:
https://reviews.llvm.org/D64118?vs=208465&id=208815#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D64118/new/
https://reviews.llvm.org/D64118
Files:
lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
lldb/trunk/packages/Python/lldbsuite/test/decorators.py
lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules
Index: lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules
@@ -90,5 +90,6 @@
ARCH_LDFLAGS += \
-L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \
- $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++.a
+ $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++_static.a \
+ -lc++abi
endif
Index: lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
+++ lldb/trunk/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
@@ -16,7 +16,7 @@
mydir = TestBase.compute_mydir(__file__)
- @skipUnlessPlatform(['android'])
+ @skipUnlessTargetAndroid
def test_cache_line_size(self):
self.build(dictionary=self.getBuildFlags())
exe = self.getBuildArtifact("a.out")
Index: lldb/trunk/packages/Python/lldbsuite/test/decorators.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/decorators.py
+++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py
@@ -596,6 +596,10 @@
"""Decorate the item to skip tests that should be skipped on Windows."""
return skipIfPlatform(["windows"])(func)
+def skipIfTargetAndroid(func):
+ return unittest2.skipIf(lldbplatformutil.target_is_android(),
+ "skip on target Android")(func)
+
def skipUnlessWindows(func):
"""Decorate the item to skip tests that should be skipped on any non-Windows platform."""
@@ -606,6 +610,10 @@
"""Decorate the item to skip tests that should be skipped on any non Darwin platform."""
return skipUnlessPlatform(lldbplatformutil.getDarwinOSTriples())(func)
+def skipUnlessTargetAndroid(func):
+ return unittest2.skipUnless(lldbplatformutil.target_is_android(),
+ "requires target to be Android")(func)
+
def skipIfHostIncompatibleWithRemote(func):
"""Decorate the item to skip tests if binaries built on this host are incompatible."""
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64118.208815.patch
Type: text/x-patch
Size: 2356 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190709/28c17a46/attachment.bin>
More information about the llvm-commits
mailing list