Index: packages/Python/lldbsuite/test/dotest.py =================================================================== --- packages/Python/lldbsuite/test/dotest.py +++ packages/Python/lldbsuite/test/dotest.py @@ -301,6 +301,13 @@ configuration.compiler = candidate break + if platform_system == 'Darwin': + if args.dsymutil: + os.environ['DSYMUTIL'] = args.dsymutil + else: + os.environ['DSYMUTIL'] = seven.get_command_output( + 'xcrun -find -toolchain default dsymutil') + if args.channels: lldbtest_config.channels = args.channels Index: packages/Python/lldbsuite/test/dotest_args.py =================================================================== --- packages/Python/lldbsuite/test/dotest_args.py +++ packages/Python/lldbsuite/test/dotest_args.py @@ -83,6 +83,8 @@ 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('Which dsymutil to use')) + # Test filtering options group = parser.add_argument_group('Test filtering options') group.add_argument( Index: packages/Python/lldbsuite/test/make/Makefile.rules =================================================================== --- packages/Python/lldbsuite/test/make/Makefile.rules +++ packages/Python/lldbsuite/test/make/Makefile.rules @@ -147,7 +147,7 @@ # 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 @@ #---------------------------------------------------------------------- # From http://blog.melski.net/tag/debugging-makefiles/ -# +# # Usage: make print-CC print-CXX print-LD #---------------------------------------------------------------------- print-%: Index: test/CMakeLists.txt =================================================================== --- test/CMakeLists.txt +++ test/CMakeLists.txt @@ -13,7 +13,7 @@ ) 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_COMMON_ARGS --arch=${LLDB_TEST_ARCH} --executable $ + --dsymutil $ -s ${CMAKE_BINARY_DIR}/lldb-test-traces --build-dir