diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-26 15:21:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-26 15:21:56 +0000 |
| commit | 09f617cf1c83e3c90c146e144c6ee8ac2c1af327 (patch) | |
| tree | 39701ada985d189e99b229bba7da7889696ab493 | |
| parent | eac4e089791c6171c06b76ab88484ecbd491e1f3 (diff) | |
enable the cppunit test under windows again, just a ; vs : problem
| -rw-r--r-- | sc/qa/unit/makefile.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk index dc9f101b3..83be94ce9 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 |