solenv/gbuild/CppunitTest.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d21e33f0f7c8e610e2f19b632fe5885c573c1691
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Jan 15 13:41:27 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Jan 15 16:13:55 2025 +0100
Fix Windows `make CppunitTest_... CPPUNITTRACE=TRUE`
...after b20d18054ca5c13376bfd723b7e442c2e011c6de "Move setting of
LD_LIBRARY_PATH closer to invocation of cppunittester" had caused that to
just
start VS without a program to debug
Change-Id: I0e9039acf3b63f2cf43f64aeecd05d51aff58979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180284
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index fdfaeff06f94..59d7df5f7ac4 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -153,10 +153,11 @@ else
$(if $(filter gdb,$(CPPUNITTRACE)),\
PYTHONWARNINGS=default) \
LO_RUNNING_UNIT_TEST=1 \
- $(ICECREAM_RUN) $(gb_CppunitTest_coredumpctl_run)
$(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
+ $(ICECREAM_RUN) $(gb_CppunitTest_coredumpctl_run) \
$(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,\
$(if $(filter lldb,$(gb_CppunitTest_GDBTRACE)),,\
env $(gb_CppunitTest_CPPTESTPRECOMMAND))) \
+ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL)
$(gb_CppunitTest_RR) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_CppunitTest_get_linktarget_target,$*) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
