diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 16:07:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-01 16:07:04 +0100 |
| commit | 575c02a34623b3bb3e596708cbc917cbe2a4eba6 (patch) | |
| tree | b9ff5b391461c8f4a6336fa19534e2f16071a734 | |
| parent | cbddc0a030fb9fa548571210fb81c7d64e916cb1 (diff) | |
| parent | 2fa0cd7de1ecbb266f8f103406903ec7d6b558f0 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/calc
Notes
split repo tag: calc_LIBREOFFICE_3_3_FREEZE
| -rw-r--r-- | sc/qa/unit/makefile.mk | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk index a553d669bf56..169620b2c7d8 100644 --- a/sc/qa/unit/makefile.mk +++ b/sc/qa/unit/makefile.mk @@ -113,25 +113,25 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb STAR_RESOURCEPATH:=$(PWD)/$(BIN):$(SOLARBINDIR) .EXPORT : STAR_RESOURCEPATH -.IF "$(OS)" == "LINUX" - -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)" - -.ELSE - +#.IF "$(OS)" == "LINUX" +# +#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)" +# +#.ELSE +# test .PHONY: $(SHL1TARGETN) @echo ---------------------------------------------------------- - @echo - WARNING!!, test disabled on your platform - @echo - Please test manually, and enable if it works + @echo - WARNING!!, test disabled due to regcomp failure on SUSE + @echo - boxes on configmgr.uno.so @echo ---------------------------------------------------------- -.ENDIF +#.ENDIF |