diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-14 16:32:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-14 16:32:49 +0000 |
| commit | dbde7b19ab80c8b2189e7be58374b44687c952e3 (patch) | |
| tree | d32f673324a8dc12b53bf244a9008f4822c1fef5 /svl/qa | |
| parent | 74bf7fdd4755890d3bde922d229fbb3491de140f (diff) | |
cppunit: make these tests work again
Diffstat (limited to 'svl/qa')
| -rw-r--r-- | svl/qa/makefile.mk | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk index b4444f5b5c12..6be2ee70fb9d 100644 --- a/svl/qa/makefile.mk +++ b/svl/qa/makefile.mk @@ -59,9 +59,42 @@ SHL1STDLIBS=\ SHL1IMPLIB=i$(SHL1TARGET) DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP= export.map +SHL1VERSIONMAP=export.map # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.INCLUDE : _cppunit.mk + +.IF "$(OS)" == "WNT" +my_file = file:/// +.ELSE +my_file = file:// +.END + +ALLTAR: test + +$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb + $(MKDIRHIER) $(@:d) + $(GNUCOPY) $? $@ + +$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb + $(MKDIRHIER) $(@:d) + $(GNUCOPY) $? $@ + +#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)ucb1$(DLLPOST) \ + -c stocservices.uno$(DLLPOST) + +test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb + @echo ---------------------------------------------------------- + @echo - start unit test \#1 on library $(SHL1TARGETN) + @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)" |