[Libreoffice-commits] .: starmath/prj starmath/qa
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Dec 20 06:45:13 PST 2010
starmath/prj/build.lst | 5 +++--
starmath/qa/cppunit/makefile.mk | 7 +++++++
starmath/qa/cppunit/test_starmath.cxx | 1 -
3 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 30ee501c485f53fe80edaf9cd356a0a5e03abae3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 20 14:44:56 2010 +0000
cppcheck: always build these tests now
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index cbfff67..1eb4c23 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -1,4 +1,4 @@
-sm starmath : l10n svx NULL
+sm starmath : l10n svx dtrans NULL
sm starmath usr1 - all sm_mkout NULL
sm starmath\inc nmake - all sm_inc NULL
sm starmath\prj get - all sm_prj NULL
@@ -6,4 +6,5 @@ sm starmath\res get - all sm_res NULL
sm starmath\sdi nmake - all sm_sdi NULL
sm starmath\source nmake - all sm_sorce sm_sdi sm_inc NULL
sm starmath\util nmake - all sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\qa\cppunit nmake - all sm_qa_cppunit sm_util NULL
diff --git a/starmath/qa/cppunit/makefile.mk b/starmath/qa/cppunit/makefile.mk
index 621ca7c..4e043e8 100644
--- a/starmath/qa/cppunit/makefile.mk
+++ b/starmath/qa/cppunit/makefile.mk
@@ -115,7 +115,14 @@ $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefil
-c $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST) \
-c $(DLLPRE)sfx$(DLLPOSTFIX)$(DLLPOST) \
-c $(DLLPRE)vcl$(DLLPOSTFIX)$(DLLPOST) \
+ -c $(DLLPRE)mcnttype$(DLLPOST) \
-c i18npool.uno$(DLLPOST)
+.IF "$(OS)" == "WNT"
+ $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
+ -c $(DLLPRE)sysdtrans$(DLLPOST) \
+ -c $(DLLPRE)ftransl$(DLLPOST)
+.ENDIF
+
#Tweak things so that we use the .res files in the solver
STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index e1e5bf4..ef51975 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -135,7 +135,6 @@ void Test::tearDown()
Test::~Test()
{
- uno::Reference< lang::XComponent >(m_xContext, uno::UNO_QUERY_THROW)->dispose();
}
void Test::tmEditMarker()
More information about the Libreoffice-commits
mailing list