This is an archive of the discontinued LLVM Phabricator instance.

Differential D64771

[lldb][test_suite] skip tests of `libstdcpp` on Android and clean up
ClosedPublic

Authored by kusmour on Jul 15 2019, 1:53 PM.

Details

Reviewers
xiaobai
labath
Commits
rGe5001fe5c1ac: [lldb][test_suite] skip tests of `libstdcpp` on Android and clean up
rLLDB366770: [lldb][test_suite] skip tests of `libstdcpp` on Android and clean up
rL366770: [lldb][test_suite] skip tests of `libstdcpp` on Android and clean up
Summary

Delete the android target from libstdcpp test category, since android no longer support libstdcxx

Diff Detail

Repository
rL LLVM

Event Timeline

kusmour created this revision.Jul 15 2019, 1:53 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 15 2019, 1:53 PM
Herald added subscribers: lldb-commits, srhines. · View Herald Transcript
labath accepted this revision.Jul 16 2019, 4:27 AM
This revision is now accepted and ready to land.Jul 16 2019, 4:27 AM
Closed by commit rL366770: [lldb][test_suite] skip tests of `libstdcpp` on Android and clean up (authored by xiaobai). · Explain WhyJul 22 2019, 5:29 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 22 2019, 5:29 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
packages/
Python/
lldbsuite/
test/
4 lines
make/
32 lines

Diff 211233

lldb/trunk/packages/Python/lldbsuite/test/dotest.py

Show First 20 Lines • Show All 1,148 Lines • ▼ Show 20 Lines if "libc++" in configuration.categoriesList:
return # libc++ category explicitly requested, let it run. return # libc++ category explicitly requested, let it run.
print("Libc++ tests will not be run because: " + reason) print("Libc++ tests will not be run because: " + reason)
configuration.skipCategories.append("libc++") configuration.skipCategories.append("libc++")
def canRunLibstdcxxTests(): def canRunLibstdcxxTests():
from lldbsuite.test import lldbplatformutil from lldbsuite.test import lldbplatformutil
platform = lldbplatformutil.getPlatform() platform = lldbplatformutil.getPlatform()
if lldbplatformutil.target_is_android():
platform = "android"
if platform == "linux": if platform == "linux":
return True, "libstdcxx always present" return True, "libstdcxx always present"
return False, "Don't know how to build with libstdcxx on %s" % platform return False, "Don't know how to build with libstdcxx on %s" % platform
def checkLibstdcxxSupport(): def checkLibstdcxxSupport():
result, reason = canRunLibstdcxxTests() result, reason = canRunLibstdcxxTests()
if result: if result:
return # libstdcxx supported return # libstdcxx supported
if "libstdcxx" in configuration.categoriesList: if "libstdcxx" in configuration.categoriesList:
return # libstdcxx category explicitly requested, let it run. return # libstdcxx category explicitly requested, let it run.
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines

lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines
ifeq "$(findstring clang,$(CC))" "clang" ifeq "$(findstring clang,$(CC))" "clang"
ARCH_CFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN) ARCH_CFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN)
ARCH_LDFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN) ARCH_LDFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN)
endif endif
ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/sysroot \ ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/sysroot \
-isystem $(NDK_ROOT)/sysroot/usr/include/$(TOOL_PREFIX) \ -isystem $(NDK_ROOT)/sysroot/usr/include/$(TOOL_PREFIX) \
-D__ANDROID_API__=$(API_LEVEL) -D__ANDROID_API__=$(API_LEVEL) \
ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm -isystem $(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH)/usr/include
ifeq (1,$(USE_LIBSTDCPP)) ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm
ARCH_CFLAGS += \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
ARCH_LDFLAGS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a
else
ARCH_CXXFLAGS += \ ARCH_CXXFLAGS += \
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include \ -isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include \
-isystem $(NDK_ROOT)/sources/android/support/include \ -isystem $(NDK_ROOT)/sources/android/support/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/include -isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/include
ARCH_LDFLAGS += \ ARCH_LDFLAGS += \
-L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \ -L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \
$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++_static.a \ $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++_static.a \
-lc++abi -lc++abi \
endif -nostdlib++