[Libreoffice-commits] .: sc/qa
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Nov 3 07:06:11 PDT 2010
sc/qa/unit/makefile.mk | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 6d58bb7ab4d51d13996e7abdfa64b4c3d642dfb7
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Nov 3 12:42:32 2010 +0100
Enable the Calc unit tests again (on Linux).
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 169620b..a553d66 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 due to regcomp failure on SUSE
- @echo - boxes on configmgr.uno.so
+ @echo - WARNING!!, test disabled on your platform
+ @echo - Please test manually, and enable if it works
@echo ----------------------------------------------------------
-#.ENDIF
+.ENDIF
More information about the Libreoffice-commits
mailing list