solenv/gbuild/CppunitTest.mk | 2 +-
solenv/gbuild/PythonTest.mk | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5eb4c5e93b0f0a3fd9cded5e086086d07cb7c92d
Author: Hannah Meeks <hmeeks4...@gmail.com>
AuthorDate: Mon Jul 18 16:42:37 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jul 18 20:22:03 2022 +0200
Mend python support for lldb cppunit tests.
Change-Id: I02f4872ac75d82f2d77c1854ce040b72883b484a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137204
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cae6e2a2f9be..821d1d6f2c74 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -137,7 +137,7 @@ else
$(if
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(if $(strip $(PYTHON_URE)),\
PYTHONDONTWRITEBYTECODE=1) \
- $(if $(strip $(CPPUNITTRACE)),\
+ $(if $(filter gdb,$(CPPUNITTRACE)),\
PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_CppunitTest_CPPTESTCOMMAND) \
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 4e81261d2354..09f039771895 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -60,6 +60,8 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
+ $(if $(filter gdb,$(CPPUNITTRACE)),\
+ PYTHONWARNINGS=default) \
$(ICECREAM_RUN) $(gb_PythonTest_GDBTRACE)
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
$(gb_PythonTest_COMMAND) \
$(if
$(PYTHON_TEST_NAME),$(PYTHON_TEST_NAME),$(MODULES)) \
