summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-03-22 20:41:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-03-22 20:41:40 +0000
commit2e3c87b5615261ebef12e6a0e06e4d34a1b734e0 (patch)
treed76483ce7627136ccb2844524fc2e0afd46a457d /sd
parentc2acb5440848c8350258ec46642301e5f952e6cc (diff)
port regression test to passive uno component registration
Diffstat (limited to 'sd')
-rw-r--r--sd/prj/build.lst2
-rw-r--r--sd/qa/unit/makefile.mk38
2 files changed, 20 insertions, 20 deletions
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index 291603c7c7d5..58931f8d0195 100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -1,4 +1,4 @@
-sd sd : filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt oox NULL
+sd sd : filter L10N:l10n animations svx sfx2 stoc canvas LIBXSLT:libxslt oox ure NULL
sd sd usr1 - all sd_mkout NULL
sd sd\inc nmake - all sd_inc NULL
sd sd\prj get - all sd_prj NULL
diff --git a/sd/qa/unit/makefile.mk b/sd/qa/unit/makefile.mk
index 27d58cd6cf47..7b43c6a21403 100644
--- a/sd/qa/unit/makefile.mk
+++ b/sd/qa/unit/makefile.mk
@@ -81,32 +81,32 @@ my_file = file://
ALLTAR: test
-#$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
-# $(MKDIRHIER) $(@:d)
-# $(GNUCOPY) $? $@
-
-#$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
-# $(MKDIRHIER) $(@:d)
-# $(GNUCOPY) $? $@
+test_components = \
+ component/framework/util/fwk
#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
-# $(MKDIRHIER) $(@:d)
-# $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
-# -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
+$(MISC)/$(TARGET)/services.input : makefile.mk
+ $(MKDIRHIER) $(@:d)
+ echo \
+ '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \
+ > $@
+
+$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input
+ $(MKDIRHIER) $(@:d)
+ $(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 ----------------------------------------------------------
- @echo disabled for now
-# $(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)"
+ $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
+ '-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)"