diff options
| author | sb <sb@openoffice.org> | 2010-10-04 17:38:17 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-10-04 17:38:17 +0200 |
| commit | ba0e9240c59cea58f99366ad94370fc6f97029f8 (patch) | |
| tree | cfd155e70db3fad0b9c381a6f0b579d1c098dd2c /solenv/inc/installationtest.mk | |
| parent | sb123: cherry-picked subsequenttests improvements from cws/sb129 -c 55b03b1b8257 (diff) | |
| parent | DEV300 (diff) | |
| download | core-ba0e9240c59cea58f99366ad94370fc6f97029f8.tar.gz core-ba0e9240c59cea58f99366ad94370fc6f97029f8.zip | |
sb132: merged in DEV300_m89
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index dc04a709245c..8540140d1533 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -89,11 +89,11 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \ echo "$$my_tmp" > $@ .END -cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb +cpptest .PHONY : $(RM) -r $(MISC)/$(TARGET)/user $(MKDIRHIER) $(MISC)/$(TARGET)/user $(CPPUNITTESTER) \ - -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ + -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) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY) @@ -103,12 +103,6 @@ cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb cpptest : $(MISC)/$(TARGET)/installation.flag .END -$(MISC)/$(TARGET)/services.rdb : - $(MKDIRHIER) $(@:d) - $(RM) $@ - $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \ - -c remotebridge.uno -c uuresolver.uno - .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" javatest .PHONY : $(JAVATARGET) $(RM) -r $(MISC)/$(TARGET)/user |