diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-10-14 14:25:42 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-10-14 14:25:42 +0200 |
| commit | 3f2f739b71e020750c86e7e09bb2d157d02c173b (patch) | |
| tree | 15b1effa915464c3aaf958f79bcbc817ee01eb92 /solenv | |
| parent | 4c0820ed7256e989dfeadb7ea28d4f7058930b70 (diff) | |
| parent | ba0e9240c59cea58f99366ad94370fc6f97029f8 (diff) | |
CWS-TOOLING: integrate CWS sb123
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 2 | ||||
| -rw-r--r-- | solenv/inc/installationtest.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 518edc683c3d..7936b6d00377 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -145,7 +145,7 @@ sub register_extensions $preregdir =~ s/\/\s*$//g; - my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |"; print "... $systemcall ...\n"; diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 30c6168c2647..8540140d1533 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -96,7 +96,7 @@ cpptest .PHONY : -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \ -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \ -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \ - $(my_cppenv) $(OOO_CPPTEST_ARGS) + $(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 @@ -111,7 +111,8 @@ javatest .PHONY : $(JAVATARGET) '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ -Dorg.openoffice.test.arg.soffice=$(my_soffice) \ -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)" == "" |