diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-28 13:11:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-28 13:13:52 +0100 |
| commit | 2db854a3dc92de8e298f113774ce73c2b19783d7 (patch) | |
| tree | 91459bd4c455363290b20c13e40510754fc88a69 /sc | |
| parent | 28785dce3c055589e560f8a0a128ced44827df99 (diff) | |
Lets try a local copy
lets copy them, on the theory that someone might be editing them during the
test
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/makefile.mk | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk index fb146b68c46b..6f63d7f096ac 100644 --- a/sc/qa/unit/makefile.mk +++ b/sc/qa/unit/makefile.mk @@ -94,11 +94,18 @@ 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) $? $@ + #Make a services.rdb with the services we know we need to get up and running -$(MISC)/$(TARGET)/services.rdb: +$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb $(MKDIRHIER) $(@:d) - $(RM) $@ - $(REGCOMP) -register -r $@ -wop \ + $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \ -c configmgr.uno$(DLLPOST) \ -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST) @@ -106,13 +113,13 @@ $(MISC)/$(TARGET)/services.rdb: STAR_RESOURCEPATH:=$(PWD)/$(BIN):$(SOLARBINDIR) .EXPORT : STAR_RESOURCEPATH -test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb +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)$(SOLARBINDIR)/types.rdb $(my_file)$(SOLARBINDIR)/udkapi.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)" |