diff options
| author | Jason Molenda <jmolenda@apple.com> | 2018-10-16 18:14:30 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2018-10-16 18:14:30 +0000 |
| commit | 0128e7f54077d6df5af51c0beb4f03e7e7cae024 (patch) | |
| tree | 79aa19b947939e736cf2ebf39adef661f87a3454 /lldb/packages/Python/lldbsuite/test | |
| parent | 2493707818de1fe3b364748eb2750606adf9e5f6 (diff) | |
| download | bcm5719-llvm-0128e7f54077d6df5af51c0beb4f03e7e7cae024.tar.gz bcm5719-llvm-0128e7f54077d6df5af51c0beb4f03e7e7cae024.zip | |
Tiny testsuite tweaks. Don't run the apple simulator
tests when targetting a device. Add an include to
safe-to-call-func to work around a modules issue with
a certain combination of header files. Add rules for
Darwin systems to ad-hoc codesign binaries that the
testsuite builds.
llvm-svn: 344635
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
3 files changed, 11 insertions, 0 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c index 613384ff73b..58650087628 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c +++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c @@ -1,3 +1,4 @@ +#include <sys/time.h> // work around module map issue with iOS sdk, <rdar://problem/35159346> #include <sys/select.h> #include <stdio.h> #include <pthread.h> diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index a6c1dd29910..77e343826f5 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -153,6 +153,7 @@ ifeq "$(OS)" "Darwin" DSYM = $(EXE).dSYM AR := $(CROSS_COMPILE)libtool ARFLAGS := -static -o + CODESIGN = codesign else AR := $(CROSS_COMPILE)ar # On non-Apple platforms, -arch becomes -m @@ -513,6 +514,9 @@ endif else $(EXE) : $(OBJECTS) $(ARCHIVE_NAME) $(LD) $(OBJECTS) $(LDFLAGS) $(ARCHIVE_NAME) -o "$(EXE)" +ifneq "$(CODESIGN)" "" + $(CODESIGN) -s - "$(EXE)" +endif endif #---------------------------------------------------------------------- @@ -557,6 +561,9 @@ endif $(DYLIB_FILENAME) : $(DYLIB_OBJECTS) ifeq "$(OS)" "Darwin" $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -install_name "$(DYLIB_EXECUTABLE_PATH)/$(DYLIB_FILENAME)" -dynamiclib -o "$(DYLIB_FILENAME)" +ifneq "$(CODESIGN)" "" + $(CODESIGN) -s - "$(DYLIB_FILENAME)" +endif ifneq "$(MAKE_DSYM)" "NO" ifneq "$(DS)" "" "$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)" diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py index 8c8fed8e44e..54836b21f81 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py @@ -95,18 +95,21 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase): @apple_simulator_test('iphone') @debugserver_test + @skipIfDarwinEmbedded def test_simulator_ostype_ios(self): self.check_simulator_ostype(sdk='iphonesimulator', platform='ios') @apple_simulator_test('appletv') @debugserver_test + @skipIfDarwinEmbedded def test_simulator_ostype_tvos(self): self.check_simulator_ostype(sdk='appletvsimulator', platform='tvos') @apple_simulator_test('watch') @debugserver_test + @skipIfDarwinEmbedded def test_simulator_ostype_watchos(self): self.check_simulator_ostype(sdk='watchsimulator', platform='watchos', arch='i386') |
