[Libreoffice-commits] .: 2 commits - sc/qa

[Caolán McNamara]

 sc/qa/unit/makefile.mk |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 09f617cf1c83e3c90c146e144c6ee8ac2c1af327
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 26 15:21:56 2010 +0000

    enable the cppunit test under windows again, just a ; vs : problem

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index dc9f101..83be94c 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -110,11 +110,9 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb
         -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
 
 #Tweak things so that we use the .res files in the solver
-STAR_RESOURCEPATH:=$(PWD)/$(BIN):$(SOLARBINDIR)
+STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(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)
@@ -125,13 +123,3 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/t
         -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 ----------------------------------------------------------
-
-.ENDIF
commit eac4e089791c6171c06b76ab88484ecbd491e1f3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 26 14:50:40 2010 +0000

    typo

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 0ee9de7..dc9f101 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -109,7 +109,7 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb
     $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
         -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
 
-#Tweak things to that we use the .res files in the solver
+#Tweak things so that we use the .res files in the solver
 STAR_RESOURCEPATH:=$(PWD)/$(BIN):$(SOLARBINDIR)
 .EXPORT : STAR_RESOURCEPATH