Skip to content

Cherry pick remote testsuite fixes #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2019
Merged

Cherry pick remote testsuite fixes #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49562e7
Modernize add-dsym test Makefile
fredriss Nov 5, 2019
fca58b2
testsuite: skipIfNoSBHeaders should skip when running remotely
fredriss Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lldb/packages/Python/lldbsuite/test/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,9 @@ def is_remote():
def skipIfNoSBHeaders(func):
"""Decorate the item to mark tests that should be skipped when LLDB is built with no SB API headers."""
def are_sb_headers_missing():
if lldb.remote_platform:
return "skip because SBHeaders tests make no sense remotely"

if lldbplatformutil.getHostPlatform() == 'darwin':
header = os.path.join(
os.environ["LLDB_LIB_DIR"],
Expand Down
24 changes: 7 additions & 17 deletions lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
CC ?= clang
ifeq "$(ARCH)" ""
ARCH = x86_64
endif

ifeq "$(OS)" ""
OS = $(shell uname -s)
endif
C_SOURCES = main.c

CFLAGS ?= -g -O0
include Makefile.rules

ifeq "$(OS)" "Darwin"
CFLAGS += -arch $(ARCH)
endif
all: a.out.dSYM hide.app/Contents/a.out.dSYM

all: main.c clean
hide.app/Contents/a.out.dSYM:
mkdir hide.app
mkdir hide.app/Contents
$(CC) $(CFLAGS) -g $<
mv a.out.dSYM hide.app/Contents
strip -x a.out

clean:
rm -rf a.out a.out.dSYM hide.app
ifneq "$(CODESIGN)" ""
$(CODESIGN) -fs - a.out
endif