diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 10:37:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-22 10:37:22 +0000 |
| commit | c10e3bcf9d8e342e1466f1d8caa6e90ba9257083 (patch) | |
| tree | 965a237755e0c86ee05cef750160bf4ed958107d /sc/qa | |
| parent | a0872eae81c09edcadc3ceac0f96e2be82340d82 (diff) | |
port regression tests to passive uno registration
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/makefile.mk | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk index 335a8b7bc70b..7e6d111ad348 100644 --- a/sc/qa/unit/makefile.mk +++ b/sc/qa/unit/makefile.mk @@ -82,38 +82,38 @@ my_file = file:// ALLTAR: test -$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb - $(MKDIRHIER) $(@:d) - $(GNUCOPY) $? $@ +test_components = \ + component/framework/util/fwk \ + component/sfx2/util/sfx \ + ucb1 \ + ucpfile1 \ + unoxml \ + i18npool -$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb +#Make a services.rdb with the services we know we need to get up and running +$(MISC)/$(TARGET)/services.input : makefile.mk $(MKDIRHIER) $(@:d) - $(GNUCOPY) $? $@ + echo \ + '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \ + > $@ -#Make a services.rdb with the services we know we need to get up and running -$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk +$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input $(MKDIRHIER) $(@:d) - $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \ - -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST) \ - -c $(DLLPRE)sfx$(DLLPOSTFIX)$(DLLPOST) \ - -c $(DLLPRE)ucb1$(DLLPOST) \ - -c $(DLLPRE)ucpfile1$(DLLPOST) \ - -c $(DLLPRE)unoxml$(DLLPOSTFIX)$(DLLPOST) \ - -c stocservices.uno$(DLLPOST) \ - -c i18npool.uno$(DLLPOST) + $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@.tmp \ + $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input + cat $(MISC)/$@.tmp | sed 's|/program/|/|g' > $@ #Tweak things so that we use the .res files in the solver STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR) .EXPORT : STAR_RESOURCEPATH -test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb +test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb @echo ---------------------------------------------------------- @echo - start unit test \#1 on library $(SHL1TARGETN) @echo In the environment: STAR_RESOURCEPATH=$$STAR_RESOURCEPATH @echo ---------------------------------------------------------- $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \ - -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \ - -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \ - -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \ - -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \ - -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)" + '-env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb $(my_file)$(SOLARBINDIR)$/types.rdb' \ + '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\ + -env:URE_INTERNAL_LIB_DIR="$(my_file)$(SOLARSHAREDBIN)" \ + -env:OOO_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)" |