Kaydet (Commit) c38a4d9c authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Make the CPPUNITTRACE="lldb --" thing work again (on macOS)

It doesn't seem to work (any longer in 10.12) to pass
DYLD_LIBRARY_PATH in the environment to the process to be run under
lldb. We need to make lldb execute an explicit 'settings set
target.env-vars' command. Use a temporary file to pass that command.

I could not figure out where to call the gb_CppunitTest_POSTGDBTRACE
macro I define, to remove the temporary file, sorry. Help appreciated.

Change-Id: I46bd05f14623639e6ce10112b92ef497cdbb0755
üst 367c9550
......@@ -29,7 +29,13 @@ gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if $(
ifeq ($(strip $(gb_CppunitTest_GDBTRACE)),)
ifneq ($(strip $(CPPUNITTRACE)),)
ifneq ($(filter gdb,$(CPPUNITTRACE)),)
gb_CppunitTest_GDBTRACE := $(subst gdb,gdb -ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))",$(CPPUNITTRACE))
else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
dyldpathfile=$(call var2file,$(shell $(gb_MKTEMP)),500,settings set target.env-vars $(gb_CppunitTest_CPPTESTPRECOMMAND))
gb_CppunitTest_GDBTRACE := $(subst lldb,lldb -s $(dyldpathfile),$(CPPUNITTRACE))
gb_CppunitTest_POSTGDBTRACE := ; rm -f $(dyldpathfile)
endif
gb_CppunitTest__interactive := $(true)
endif
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment