[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

[Luboš Luňák]

 solenv/gbuild/platform/com_MSC_class.mk |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit c1f0f890f5065f88164add33707228f8c6d57555
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Mon Jul 15 14:13:13 2013 +0200

    add gb_JunitTest_SOFFICEARG setting also for windows
    
    Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed .
    
    Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca

diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 45bf122..2283114 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -446,6 +446,17 @@ endef
 gb_defaultlangiso := en-US
 gb_smoketest_instset := $(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
 
+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:=path:$(gb_DEVINSTALLROOT)/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:$(gb_DEVINSTALLROOT)/program/soffice.exe}" \