diff options
| author | sb <sb@openoffice.org> | 2010-05-14 16:22:06 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-05-14 16:22:06 +0200 |
| commit | 1804fe336801f19c3e66e2d514ece5b3e17ac480 (patch) | |
| tree | ce3954ffbf09f8de08ec24a847473ea8cf2aff75 /solenv/inc/installationtest.mk | |
| parent | sb123: merged in late changes of cws/sb120 (diff) | |
| download | core-1804fe336801f19c3e66e2d514ece5b3e17ac480.tar.gz core-1804fe336801f19c3e66e2d514ece5b3e17ac480.zip | |
sb123: #i111601# various additional test helper functionality
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index dcc3a638a8fd..dd069439f5bf 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -96,7 +96,8 @@ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb -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) $(OOO_CPPTEST_ARGS) + -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 @@ -117,7 +118,8 @@ javatest .PHONY : $(JAVATARGET) '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ -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 \ + $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \ + org.junit.runner.JUnitCore \ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) $(RM) -r $(MISC)/$(TARGET)/user .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" |