[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_ucalc.mk sc/Module_sc.mk sc/Package_qa_unit.mk sc/qa
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Apr 11 03:45:58 PDT 2011
sc/CppunitTest_sc_ucalc.mk | 13 ++++
sc/Module_sc.mk | 7 ++
sc/Package_qa_unit.mk | 44 +++++++++++++++
sc/qa/unit/Makefile | 53 ++++++++++++++++++
sc/qa/unit/makefile.mk | 131 ---------------------------------------------
sc/qa/unit/ucalc.cxx | 3 -
6 files changed, 118 insertions(+), 133 deletions(-)
New commits:
commit 61f3ffa098242b7ecb790645899e90d7493d52a0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Apr 11 12:23:46 2011 +0200
fdo#36128: disabled testCVEs for now in ucalc.cxx as it fails
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index e873bac..b489528 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -266,7 +266,8 @@ public:
CPPUNIT_TEST(testGraphicsInGroup);
CPPUNIT_TEST(testStreamValid);
CPPUNIT_TEST(testFunctionLists);
- CPPUNIT_TEST(testCVEs);
+ // fdo#36128 disabled for now because it fails
+ //CPPUNIT_TEST(testCVEs);
CPPUNIT_TEST_SUITE_END();
private:
commit 361a8eb04f3c1f933632011394197a2d89c9ae7c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Apr 11 12:22:52 2011 +0200
reenable ucalc.cxx unittest in gbuild
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index fac15fc..0c857ab 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -29,10 +29,23 @@
$(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc))
+$(eval $(call gb_CppunitTest_add_package_headers,sc_ucalc,sc_qa_unit))
+
$(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
sc/qa/unit/ucalc \
))
+$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
+ --headless \
+ --invisible \
+ "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\
+ file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \
+ "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sc/qa/unit/services.rdb,\
+ file://$(if $(filter WNT,$(OS)),/)$(rdb))" \
+ $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR, \
+ -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \
+))
+
$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 717cdbd..73ae040 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -32,6 +32,11 @@ $(eval $(call gb_Module_add_targets,sc,\
Package_uiconfig \
Package_xml \
))
-# CppunitTest_sc_ucalc \
+
+$(eval $(call gb_Module_add_check_targets,sc,\
+ CppunitTest_sc_ucalc \
+ Package_qa_unit \
+))
+
# vim: set noet ts=4 sw=4:
diff --git a/sc/Package_qa_unit.mk b/sc/Package_qa_unit.mk
new file mode 100644
index 0000000..8db8cb7
--- /dev/null
+++ b/sc/Package_qa_unit.mk
@@ -0,0 +1,44 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,sc_qa_unit,$(WORKDIR)/CustomTarget/sc/qa/unit))
+$(eval $(call gb_Package_add_customtarget,sc_qa_unit,sc/qa/unit))
+
+# dependencies that cause the CustomTarget Makefile to be called recursively for
+# (re)build
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,sc/qa/unit,\
+ $(foreach newcomponentfile,\
+ framework/util/fwk \
+ sfx2/util/sfx \
+ unoxml/source/service/unoxml,\
+ $(OUTDIR)/xml/component/$(newcomponentfile).component) \
+ $(foreach oldcomponentfile, \
+ i18npool \
+ ucb1 \
+ ucpfile1, \
+ $(OUTDIR)/xml/$(oldcomponentfile).component) \
+))
+
+# vim: set noet sw=4:
diff --git a/sc/qa/unit/Makefile b/sc/qa/unit/Makefile
new file mode 100644
index 0000000..7bdedd0
--- /dev/null
+++ b/sc/qa/unit/Makefile
@@ -0,0 +1,53 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+MYDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
+
+all : services.rdb
+
+services.rdb : $(foreach newcomponentfile,\
+ framework/util/fwk \
+ sfx2/util/sfx \
+ unoxml/source/service/unoxml,\
+ $(OUTDIR)/xml/component/$(newcomponentfile).component \
+)
+
+services.rdb : $(foreach oldcomponentfile, \
+ i18npool \
+ ucb1 \
+ ucpfile1, \
+ $(OUTDIR)/xml/$(oldcomponentfile).component \
+)
+
+services.rdb :
+ echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@
+ $(gb_AWK) -- \
+ '/^<\?xml version.*/ { next; } \
+ { gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); print; }' \
+ $^ >> $@
+ echo '</components>' >> $@
+
+.PHONY : all
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
deleted file mode 100644
index 1f8e93a..0000000
--- a/sc/qa/unit/makefile.mk
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Michael Meeks <michael.meeks at novell.com>
-# Caolan McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-PRJ=..$/..
-PRJNAME=sc
-TARGET=qa_unit
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS) -I../../source/ui/inc
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/ucalc.obj
-SHL1STDLIBS= \
- $(BASICLIB) \
- $(VBAHELPERLIB) \
- $(SFXLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(SVXCORELIB) \
- $(EDITENGLIB) \
- $(SVXLIB) \
- $(BASEGFXLIB) \
- $(DRAWINGLAYERLIB) \
- $(VCLLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(TKLIB) \
- $(VOSLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(UNOTOOLSLIB) \
- $(SOTLIB) \
- $(XMLOFFLIB) \
- $(AVMEDIALIB) \
- $(FORLIB) \
- $(FORUILIB) \
- $(CPPUNITLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/scalc3.lib $(SLB)$/scalc3c.lib
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
-
-ALLTAR: test
-
-test_components = \
- component/framework/util/fwk \
- component/sfx2/util/sfx \
- component/unoxml/source/service/unoxml \
- ucb1 \
- ucpfile1 \
- i18npool
-
-#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.input : makefile.mk
- $(MKDIRHIER) $(@:d)
- echo \
- '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \
- > $@
-
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input
- $(MKDIRHIER) $(@:d)
- $(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
-
-.IF "$(OS)" != "DRAGONFLY"
-
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
- @echo ----------------------------------------------------------
- @echo - start unit test \#1 on library $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL1TARGETN) --headless --invisible \
- '-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)" \
- -env:BRAND_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)"
-
-.ELSE
-
-test .PHONY: $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- @echo - WARNING!!, test disabled on your platform
- @echo - Please test manually, and enable if it works
- @echo ----------------------------------------------------------
-
-.ENDIF
More information about the Libreoffice-commits
mailing list