diff options
| author | sb <sb@openoffice.org> | 2010-05-14 09:46:21 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-14 09:46:21 +0200 |
| commit | 40b3e52f33b1bb5c69c36c8a8b93ef56b14ea2d2 (patch) | |
| tree | 2f5056458cb834b5d6f462732703d0339d25ba90 /solenv | |
| parent | df9c80c0687c0cf545d7e4d79493fef59772dae9 (diff) | |
sb120: #i111558# allow override of tested soffice process
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/installationtest.mk | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index e13015d182ac..dcc3a638a8fd 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -49,12 +49,20 @@ installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT) .END .IF "$(OS)" == "MACOSX" -my_soffice = $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice +my_sofficepath = \ + $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice .ELIF "$(OS)" == "WNT" -my_soffice = \ - $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe' +my_sofficepath = \ + $(installationtest_instpath)/opt/OpenOffice.org 3/program/soffice.exe .ELSE -my_soffice = $(installationtest_instpath)/opt/openoffice.org3/program/soffice +my_sofficepath = \ + $(installationtest_instpath)/opt/openoffice.org3/program/soffice +.END + +.IF "$(OOO_TEST_SOFFICE)" == "" +my_soffice = path:$(my_sofficepath) +.ELSE +my_soffice = $(OOO_TEST_SOFFICE) .END .IF "$(OOO_LIBRARY_PATH_VAR)" != "" @@ -70,7 +78,7 @@ my_javaenv = \ # which is removed after smoketest); can be removed once issue 50885 is fixed; # on other platforms, a single installation to solver is created in # smoketestoo_native: -.IF "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(MISC)/$(TARGET)/installation.flag : $(shell \ ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip) $(MKDIRHIER) $(@:d) @@ -87,10 +95,10 @@ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb $(CPPUNITTESTER) \ -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ - -env:arg-path=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ - $(my_cppenv) $(OOO_CPPTEST_ARGS) + -env:arg-soffice='$(my_soffice:s/'/'\''/)' \ + -env:arg-user=$(MISC)/$(TARGET)/user $(my_cppenv) $(OOO_CPPTEST_ARGS) $(RM) -r $(MISC)/$(TARGET)/user -.IF "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag cpptest : $(MISC)/$(TARGET)/installation.flag .END @@ -107,12 +115,12 @@ javatest .PHONY : $(JAVATARGET) $(MKDIRHIER) $(MISC)/$(TARGET)/user $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ - -Dorg.openoffice.test.arg.path=$(my_soffice) \ + -Dorg.openoffice.test.arg.soffice='$(my_soffice:s/'/'\''/)' \ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ $(my_javaenv) org.junit.runner.JUnitCore \ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) $(RM) -r $(MISC)/$(TARGET)/user -.IF "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag .END |