summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2025-01-11 00:12:37 +0200
committerNoel Grandin <noelgrandin@gmail.com>2025-01-11 10:06:37 +0100
commit9e8e01c54826995c92667b52faffe1d8113c7c80 (patch)
tree335a2ed5c93428a320528b55ec38dec963c1bd7d
parentc9ae567c791bcffdc3fff9e3fb11b46275a13d2b (diff)
fix debugging unit tests under macOS 15.2
as of macOS 15.2, trying to debug a unit test will fail because "env" is hardened and we were calling that around our actual executable. But we don't need that, since we already pass in the required stuff via a command that is inserted before the call to lldb. Change-Id: I4caa91d8ef45326375aa86944b0cee9799acaa59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180090 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--solenv/gbuild/CppunitTest.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 4aca3b7f2186..fdfaeff06f94 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -154,7 +154,9 @@ else
PYTHONWARNINGS=default) \
LO_RUNNING_UNIT_TEST=1 \
$(ICECREAM_RUN) $(gb_CppunitTest_coredumpctl_run) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
- $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,env $(gb_CppunitTest_CPPTESTPRECOMMAND)) \
+ $(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,\
+ $(if $(filter lldb,$(gb_CppunitTest_GDBTRACE)),,\
+ env $(gb_CppunitTest_CPPTESTPRECOMMAND))) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_CppunitTest_get_linktarget_target,$*) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \