From 24a94d9d539be238fc60bdd13a1da20e6f9feb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 1 Nov 2010 10:55:09 +0000 Subject: [PATCH] give another go at enabling this test using rdb copies and only for Linux --- sc/prj/build.lst | 1 + sc/qa/unit/makefile.mk | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/sc/prj/build.lst b/sc/prj/build.lst index afdd953d2274..a78f523cd295 100755 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -48,3 +48,4 @@ sc sc\addin\datefunc nmake - all sc_addfu sc_add sc_sdi sc_inc NULL sc sc\addin\rot13 nmake - all sc_adrot sc_add sc_sdi sc_inc NULL sc sc\addin\util nmake - all sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL sc sc\util nmake - all sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style sc_tool sc_uisrc sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc sc_ftools sc_inc sc_vba NULL +sc sc\qa\unit nmake - all sc_qa_cppunit sc_util NULL diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk index 6f63d7f096ac..a553d669bf56 100644 --- a/sc/qa/unit/makefile.mk +++ b/sc/qa/unit/makefile.mk @@ -113,6 +113,8 @@ $(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) @@ -123,3 +125,13 @@ 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