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

[Caolán McNamara]

 sc/prj/build.lst       |    4 ++--
 sc/qa/unit/makefile.mk |   42 +++++++++++++++++++++---------------------
 sc/qa/unit/ucalc.cxx   |    4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit a860711298347fb0d260f388ecad7f1286af4312
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 22 11:49:41 2011 +0000

    get regression test working again

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8fc4c93..3a2bad7 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -398,14 +398,14 @@ void Test::testVolatileFunc()
 
     val = 0;
     m_pDoc->SetValue(0, 0, 0, val);
-    m_xDocShRef->DoRecalc(true);
+    m_pDoc->CalcFormulaTree(false, true);
     double zero;
     m_pDoc->GetValue(0, 1, 0, zero);
     CPPUNIT_ASSERT_MESSAGE("Result should equal the 3rd parameter of IF, which is zero.", zero == 0.0);
 
     val = 1;
     m_pDoc->SetValue(0, 0, 0, val);
-    m_xDocShRef->DoRecalc(true);
+    m_pDoc->CalcFormulaTree(false, true);
     double now2;
     m_pDoc->GetValue(0, 1, 0, now2);
     CPPUNIT_ASSERT_MESSAGE("Result should be the value of NOW() again.", (now2 - now1) >= 0.0);
commit e261f17d4302310fa6eebe8812db3d5782f00839
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 22 10:37:22 2011 +0000

    port regression tests to passive uno registration

diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 382009a..b74ce38 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,4 +1,4 @@
-sc      sc      :       filter L10N:l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml NULL
+sc      sc      :       filter L10N:l10n vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure NULL
 sc	sc							usr1	-	all	sc_mkout NULL
 sc	sc\inc							nmake	-	all	sc_inc NULL
 sc	sc\prj							get	-	all	sc_prj NULL
@@ -43,4 +43,4 @@ sc	sc\source\filter\html					nmake	-	all	sc_html sc_sdi sc_inc NULL
 sc	sc\source\filter\xml					nmake	-	all	sc_xml sc_sdi sc_inc NULL
 sc	sc\source\filter\xcl97					nmake	-	all	sc_xcl97 sc_sdi sc_inc NULL
 sc	sc\util							nmake	-	all	sc_util 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
+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 335a8b7..7e6d111 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -82,38 +82,38 @@ my_file = file://
 
 ALLTAR: test
 
-$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
-    $(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $? $@
+test_components = \
+    component/framework/util/fwk \
+    component/sfx2/util/sfx \
+    ucb1 \
+    ucpfile1 \
+    unoxml \
+    i18npool
 
-$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
+#Make a services.rdb with the services we know we need to get up and running
+$(MISC)/$(TARGET)/services.input : makefile.mk
     $(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $? $@
+    echo \
+        '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \
+        > $@
 
-#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk
+$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input
     $(MKDIRHIER) $(@:d)
-    $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
-        -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST) \
-        -c $(DLLPRE)sfx$(DLLPOSTFIX)$(DLLPOST) \
-        -c $(DLLPRE)ucb1$(DLLPOST) \
-        -c $(DLLPRE)ucpfile1$(DLLPOST) \
-        -c $(DLLPRE)unoxml$(DLLPOSTFIX)$(DLLPOST) \
-        -c stocservices.uno$(DLLPOST) \
-        -c i18npool.uno$(DLLPOST)
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@.tmp \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input
+    cat $(MISC)/$@.tmp | sed 's|/program/|/|g' > $@
 
 #Tweak things so that we use the .res files in the solver
 STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
 .EXPORT : STAR_RESOURCEPATH
 
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
+test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
     @echo ----------------------------------------------------------
     @echo - start unit test \#1 on library $(SHL1TARGETN)
     @echo In the environment: STAR_RESOURCEPATH=$$STAR_RESOURCEPATH
     @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)"
+        '-env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb $(my_file)$(SOLARBINDIR)$/types.rdb' \
+        '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\
+        -env:URE_INTERNAL_LIB_DIR="$(my_file)$(SOLARSHAREDBIN)" \
+        -env:OOO_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)"