diff options
| author | Hannah Meeks <hmeeks4135@gmail.com> | 2022-07-13 14:45:37 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-07-14 10:20:35 +0200 |
| commit | 7a4814f717520b8de8c963dc2d576f05fc15d2e9 (patch) | |
| tree | d48b893b20d3e1fc8afcb1faeb9a4df734849f93 /solenv | |
| parent | febfbaff07562dd68bc2b5bc870699754f763e50 (diff) | |
Change make file so that debugging works - Previous error:
hannah@localhost:~/master/sw> make CppunitTest_sw_macros_test CPPUNITTRACE="gdb --args"
[CUT] sw_macros_test
S=/data/opt/libreoffice/master && I=$S/instdir && W=$S/workdir && mkdir -p $W/CppunitTest/ && rm -fr $W/CppunitTest/sw_macros_test.test.user && cp -r $W/unittest $W/CppunitTest/sw_macros_test.test.user && ( MAX_CONCURRENCY=4 MOZILLA_CERTIFICATE_FOLDER=dbm: SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION=1 SAL_USE_VCLPLUGIN=svp LIBO_LANG=C icerun PYTHONWARNINGS=default gdb -return-child-result -ex "add-auto-load-safe-path $S/instdir" -ex "set environment LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program":$W/UnpackedTarball/cppunit/src/cppunit/.libs" -ex 'set environment MALLOC_CHECK_=2; set environment MALLOC_PERTURB_=153' --args $W/LinkTarget/Executable/cppunittester $W/LinkTarget/CppunitTest/libtest_sw_macros_test.so --headless "-env:BRAND_BASE_DIR=file://$S/instdir" "-env:BRAND_SHARE_SUBDIR=share" "-env:BRAND_SHARE_RESOURCE_SUBDIR=program/resource" "-env:UserInstallation=file://$W/CppunitTest/sw_macros_test.test.user" "-env:CONFIGURATION_LAYERS=xcsxcu:file://$I/share/registry xcsxcu:file://$W/unittest/registry" "-env:UNO_TYPES=file://$I/program/types/offapi.rdb file://$I/program/types/oovbaapi.rdb file://$I/program/types.rdb" "-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb file://$W/Rdb/services.rdb" -env:URE_BIN_DIR=file://$I/program -env:URE_INTERNAL_LIB_DIR=file://$I/program -env:LO_LIB_DIR=file://$I/program -env:LO_JAVA_DIR=file://$I/program/classes --protector $W/LinkTarget/Library/unoexceptionprotector.so unoexceptionprotector --protector $W/LinkTarget/Library/unobootstrapprotector.so unobootstrapprotector --protector $W/LinkTarget/Library/libvclbootstrapprotector.so vclbootstrapprotector "-env:CPPUNITTESTTARGET=$W/CppunitTest/sw_macros_test.test" )
ICECC[448] 2022-07-13 13:23:02: couldn't find any PYTHONWARNINGS=default
ICECC[448] 2022-07-13 13:23:02: could not find PYTHONWARNINGS=default in PATH.
make: *** [/data/opt/libreoffice/master/solenv/gbuild/CppunitTest.mk:121: /data/opt/libreoffice/master/workdir/CppunitTest/sw_macros_test.test] Error 115
hannah@localhost:~/master/sw>
Change-Id: Idebbd385f70edd9b691d91f6eded8ee02ac9cce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137032
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 7900c8f05ac5..cae6e2a2f9be 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -26,10 +26,10 @@ ifneq ($(strip $(CPPUNITTRACE)),) ifneq ($(filter gdb,$(CPPUNITTRACE)),) # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, into the "gdb --args" command line gb_CppunitTest_GDBTRACE := $(subst gdb,\ - PYTHONWARNINGS=default gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\ + gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\ $(CPPUNITTRACE)) gb_PythonTest_GDBTRACE := $(subst gdb,\ - PYTHONWARNINGS=default gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\ + gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\ $(CPPUNITTRACE)) else ifneq ($(filter lldb,$(CPPUNITTRACE)),) gb_CppunitTest_GDBTRACE := $(subst lldb,\ @@ -137,6 +137,8 @@ else $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(if $(strip $(PYTHON_URE)),\ PYTHONDONTWRITEBYTECODE=1) \ + $(if $(strip $(CPPUNITTRACE)),\ + PYTHONWARNINGS=default) \ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \ $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_CppunitTest_get_linktarget_target,$*) \ |