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-15 14:13:40 +0200 |
| commit | 8bcb9090efe5a8c08881d0a39f102c5f736f2da6 (patch) | |
| tree | b35cdf7e16561bc658ff8dc2496c0293b0b8241f | |
| parent | 652ccbdf3111766fadc379a8cf4650b744e1e19c (diff) | |
add gb_JunitTest_SOFFICEARG setting also for windows
Needed since e352abc2e60abd21e383ebf971e545ca510ac4ed .
Change-Id: I1f46a01f319703a2225386e89fc94ca286b301ca
| -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 e8c30bfab584..dd5ceed497fa 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -443,6 +443,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}" \ |