diff options
| author | Jason Molenda <jmolenda@apple.com> | 2017-09-25 18:19:39 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2017-09-25 18:19:39 +0000 |
| commit | 8652b249e6ede3f495bf96820b6f34110aafa84d (patch) | |
| tree | 6f11d7e6b9f8070347afefa03148b1f43edfc748 /lldb/packages/Python/lldbsuite/test/make | |
| parent | bbe448abd828b98d22c703fff4325e0251071efa (diff) | |
| download | bcm5719-llvm-8652b249e6ede3f495bf96820b6f34110aafa84d.tar.gz bcm5719-llvm-8652b249e6ede3f495bf96820b6f34110aafa84d.zip | |
Initial patchset to get the testsuite running against armv7 and arm64 iOS devices.
Normal customer devices won't be able to run these tests, we're hoping to get
a public facing bot set up at some point. Both devices pass the testsuite without
any errors or failures.
I have seen some instability with the armv7 test runs, I may submit additional patches
to address this. arm64 looks good.
I'll be watching the bots for the rest of today; if any problems are introduced by
this patch I'll revert it - if anyone sees a problem with their bot that I don't
see, please do the same. I know it's a rather large patch.
One change I had to make specifically for iOS devices was that debugserver can't
create files. There were several tests that launch the inferior process redirecting
its output to a file, then they retrieve the file. They were not trying to test
file redirection in these tests, so I rewrote those to write their output to a file
directly.
llvm-svn: 314132
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index a7b94ef5738..283a9b2bdb5 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -78,6 +78,24 @@ ifneq "$(TRIPLE)" "" endif endif endif + ifeq "$(TRIPLE_OS)" "watchos" + ifeq "$(SDKROOT)" "" + # Set SDKROOT if it wasn't set + ifneq (,$(findstring arm,$(ARCH))) + SDKROOT = $(shell xcrun --sdk watchos --show-sdk-path) + ifeq "$(TRIPLE_VERSION)" "" + TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + endif + ARCH_CFLAGS :=-mwatchos-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + else + SDKROOT = $(shell xcrun --sdk watchsimulator --show-sdk-path) + ifeq "$(TRIPLE_VERSION)" "" + TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') + endif + ARCH_CFLAGS :=-mwatchos-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + endif + endif + endif endif endif ifeq "$(OS)" "Android" @@ -225,7 +243,7 @@ CXXFLAGS += $(subst -fmodules,, $(CFLAGS)) LD = $(CC) LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS) -ifeq (,$(filter $(OS), Windows_NT Android)) +ifeq (,$(filter $(OS), Windows_NT Android Darwin)) ifneq (,$(filter YES,$(ENABLE_THREADS))) LDFLAGS += -pthread endif |
