diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-07-15 14:13:13 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-17 14:37:01 +0200 |
| commit | c1f0f890f5065f88164add33707228f8c6d57555 (patch) | |
| tree | c2f14395df59c10ff1f21fa0e51861cbd6d2dacf /solenv | |
| parent | 909c46de8281f86c6c5260c4bbd28033b9e1adca (diff) | |
add gb_JunitTest_SOFFICEARG setting also for windows
Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed .
Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 45bf122c14bf..2283114f075c 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}" \ |