diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 6 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest_args.py | 2 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 4 | ||||
| -rw-r--r-- | lldb/test/CMakeLists.txt | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 6fa85cb147d..6abf1636b11 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -301,6 +301,12 @@ def parseOptionsAndInitTestdirs(): configuration.compiler = candidate break + if args.dsymutil: + os.environ['DSYMUTIL'] = args.dsymutil + else if platform_system == 'Darwin': + os.environ['DSYMUTIL'] = seven.get_command_output( + 'xcrun -find -toolchain default dsymutil') + if args.channels: lldbtest_config.channels = args.channels diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py index 1f3eca39d06..e878076bd3c 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -83,6 +83,8 @@ def create_parser(): help=textwrap.dedent('''Specify the extra flags to be passed to the toolchain when building the inferior programs to be debugged suggestions: do not lump the "-A arch1 -A arch2" together such that the -E option applies to only one of the architectures''')) + group.add_argument('--dsymutil', metavar='dsymutil', dest='dsymutil', help=textwrap.dedent('Specify Which dsymutil to use.')) + # Test filtering options group = parser.add_argument_group('Test filtering options') group.add_argument( diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 6b9cc9c7e02..facd33cf80c 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -147,7 +147,7 @@ ARCHFLAG ?= -arch # Change any build/tool options needed #---------------------------------------------------------------------- ifeq "$(OS)" "Darwin" - DS := $(shell xcrun -find -toolchain default dsymutil) + DS := $(DSYMUTIL) DSFLAGS = DSYM = $(EXE).dSYM AR := $(CROSS_COMPILE)libtool @@ -668,7 +668,7 @@ endif #---------------------------------------------------------------------- # From http://blog.melski.net/tag/debugging-makefiles/ -# +# # Usage: make print-CC print-CXX print-LD #---------------------------------------------------------------------- print-%: diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 2bf7ff0d9b8..a3605d5c324 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -13,7 +13,7 @@ function(add_python_test_target name test_script args comment) ) endfunction() -set(LLDB_TEST_DEPS lldb) +set(LLDB_TEST_DEPS lldb dsymutil) # darwin-debug is an hard dependency for the testsuite. if (CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -67,6 +67,7 @@ set(LLDB_TEST_USER_ARGS set(LLDB_TEST_COMMON_ARGS --arch=${LLDB_TEST_ARCH} --executable $<TARGET_FILE:lldb> + --dsymutil $<TARGET_FILE:dsymutil> -s ${CMAKE_BINARY_DIR}/lldb-test-traces --build-dir |
