diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-25 14:36:18 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-25 15:14:32 +0100 |
| commit | b684a5bb0374719976accaa9cedca44fa3d821ad (patch) | |
| tree | beeeee872aa624fb6a0639561d70bcebf509832c /solenv/gbuild/platform/unxgcc.mk | |
| parent | a5cabdbc747bfd13216bf45f50ec36ad28cfed53 (diff) | |
create debugrun target, adjust JunitTests to them
Diffstat (limited to 'solenv/gbuild/platform/unxgcc.mk')
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 8c8380c5acda..d34d4a101648 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -377,16 +377,40 @@ endef # JunitTest class +ifneq ($(OOO_TEST_SOFFICE),) +gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) +else +ifneq ($(gb_JunitTest_DEBUGRUN),) +gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) +else +gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice" +endif +endif + define gb_JunitTest_JunitTest_platform $(call gb_JunitTest_get_target,$(1)) : DEFS := \ - -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}" \ -Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \ -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \ -Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh \ + -Dorg.openoffice.test.arg.soffice="$(gb_JunitTest_SOFFICEARG)" \ + +endef +# Module class + +define gb_Module_DEBUGRUNCOMMAND +OFFICESCRIPT=`mktemp` && \ +echo ". $(OUTDIR)/installation/opt/program/ooenv" > $${OFFICESCRIPT} && \ +echo "$(OUTDIR)/installation/opt/program/soffice.bin --norestore --nologo \"--accept=pipe,name=$(USER);urp;\" -env:UserInstallation=file://$(OUTDIR)/installation/ &" >> $${OFFICESCRIPT} && \ +echo "OFFICEPID=\$$!" >> $${OFFICESCRIPT} && \ +echo "echo \"office started as \$${OFFICEPID}\"" >> $${OFFICESCRIPT} && \ +echo "gdb -ex \"at \$${OFFICEPID}\" -ex \"c\"" >> $${OFFICESCRIPT} && \ +$(SHELL) $${OFFICESCRIPT} && \ +rm $${OFFICESCRIPT} endef + # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload |