diff options
| author | sb <sb@openoffice.org> | 2010-05-20 09:52:28 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-20 09:52:28 +0200 |
| commit | 4a99935f1bfe8c19071eaaf6b478944f07c4c0ef (patch) | |
| tree | ba1f1253ff3524c0cc50797a609161e03f52069a /solenv/inc/installationtest.mk | |
| parent | 72c758d28d0698a23ec5f185cc0b73f6ce11f389 (diff) | |
| parent | 4aee4ee739adaa21e46876ec1c4ac941d54ed8d5 (diff) | |
sb123: merged in late changes of cws/sb120
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index dd069439f5bf..dc04a709245c 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -53,7 +53,7 @@ my_sofficepath = \ $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice .ELIF "$(OS)" == "WNT" my_sofficepath = \ - $(installationtest_instpath)/opt/OpenOffice.org 3/program/soffice.exe + $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe' .ELSE my_sofficepath = \ $(installationtest_instpath)/opt/openoffice.org3/program/soffice @@ -62,7 +62,7 @@ my_sofficepath = \ .IF "$(OOO_TEST_SOFFICE)" == "" my_soffice = path:$(my_sofficepath) .ELSE -my_soffice = $(OOO_TEST_SOFFICE) +my_soffice = '$(OOO_TEST_SOFFICE:s/'/'\''/)' .END .IF "$(OOO_LIBRARY_PATH_VAR)" != "" @@ -95,9 +95,8 @@ 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-soffice='$(my_soffice:s/'/'\''/)' \ - -env:arg-user=$(MISC)/$(TARGET)/user $(my_cppenv) \ - $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) + -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ + $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag @@ -116,7 +115,7 @@ javatest .PHONY : $(JAVATARGET) $(MKDIRHIER) $(MISC)/$(TARGET)/user $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ - -Dorg.openoffice.test.arg.soffice='$(my_soffice:s/'/'\''/)' \ + -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \ $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \ org.junit.runner.JUnitCore \ |