[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk
cppcanvas/CppunitTest_cppcanvas_emfplus.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 7dc96ebc05014b787d79a282981cdd0f8750abad Author: David Tardon Date: Tue Jul 29 10:07:43 2014 +0200 fdo#81799 we need cppuhelper here too Change-Id: I719557813180c3f862ef4b00e24142fdbbb0daf0 diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index 951c37c..e187a2a 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_emfplus, \ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \ comphelper \ cppu \ + cppuhelper \ sal \ sfx \ test \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk
cppcanvas/CppunitTest_cppcanvas_emfplus.mk |4 1 file changed, 4 insertions(+) New commits: commit 5631661e1fa122d84d1b5fc780c7bea1b7a97d34 Author: Stephan Bergmann Date: Fri Aug 8 17:41:33 2014 +0200 Missing test dependencies Change-Id: I7ea8f2b02b66a15e86e20948536c34017d6a3999 diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index e187a2a..6853cd4 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -62,4 +62,8 @@ $(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus)) $(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus)) +$(call gb_CppunitTest_get_target,cppcanvas_emfplus): \ +$(call gb_AllLangResTarget_get_target,ofa) \ +$(call gb_AllLangResTarget_get_target,sd) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk cppcanvas/Module_cppcanvas.mk cppcanvas/qa
cppcanvas/CppunitTest_cppcanvas_emfplus.mk| 65 ++
cppcanvas/Module_cppcanvas.mk |4 +
cppcanvas/qa/extras/emfplus/data/fdo77229.emf |binary
cppcanvas/qa/extras/emfplus/emfplus.cxx | 92 ++
4 files changed, 161 insertions(+)
New commits:
commit c3d90aa384d82cbd0dd9f60d5576dbdca9ec1e53
Author: Miklos Vajna
Date: Thu Apr 10 11:56:47 2014 +0200
fdo#77229 testcase
We didn't have EMF+ rendering testcases so far, let's see if it works
out to render into a bitmap and then just assert pixel position colors
there. It's better than nothing for missing shapes at least.
Change-Id: I2d1c63fef1127f69af7156ed6c99553845f77c9f
diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
new file mode 100644
index 000..d6a73b5
--- /dev/null
+++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,cppcanvas_emfplus, \
+ cppcanvas/qa/extras/emfplus/emfplus \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
+ comphelper \
+ cppu \
+ sal \
+ sfx \
+ test \
+ tl \
+ unotest \
+ vcl \
+))
+
+$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\
+ canvas/source/cairo/cairocanvas \
+ canvas/source/factory/canvasfactory \
+ cppcanvas/source/uno/mtfrenderer \
+ configmgr/source/configmgr \
+ extensions/source/scanner/scn \
+ filter/source/config/cache/filterconfig1 \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ sd/util/sd \
+ sd/util/sdd \
+ svl/source/fsstor/fsstorage \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 9894f9c..62ba638 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -29,6 +29,10 @@ ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
$(eval $(call gb_Module_add_check_targets,cppcanvas,\
CppunitTest_cppcanvas_test \
))
+
+$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
+CppunitTest_cppcanvas_emfplus \
+))
endif
# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
new file mode 100755
index 000..1f12717
Binary files /dev/null and b/cppcanvas/qa/extras/emfplus/data/fdo77229.emf
differ
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
new file mode 100644
index 000..adfb11c
--- /dev/null
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -0,0 +1,92 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace com::sun::star;
+
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+public:
+Test()
+: mpTestDocumentPath("/cppcanvas/qa/extras/emfplus/data/")
+{
+}
+
+virtual ~Test()
+{
+}
+
+virtual void setUp() SAL_OVERRIDE
+{
+test::BootstrapFixture::setUp();
+
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+};
+
+virtual void tearDown() SAL_OVERRIDE
+{
+if (mxComponent.is())
+mxComponent->dispose();
+test::BootstrapFixt
[Libreoffice-commits] core.git: cppcanvas/CppunitTest_cppcanvas_emfplus.mk solenv/gbuild test/Library_subsequenttest.mk test/Library_test.mk
cppcanvas/CppunitTest_cppcanvas_emfplus.mk |4 --- solenv/gbuild/CppunitTest.mk | 30 +++-- test/Library_subsequenttest.mk |7 -- test/Library_test.mk |7 -- 4 files changed, 25 insertions(+), 23 deletions(-) New commits: commit 798f410a94fb6b59610def117199c9d3e8e87d90 Author: Stephan Bergmann Date: Thu Jun 12 13:49:45 2014 +0200 Fix vclplug_* dependencies for gb_CppunitTest_use_vcl ...and replace gb_CppunitTest_unset_headless with gb_CppunitTest_use_vcl_non_headless. Change-Id: Ibd859f98ed8df09988ca26ffcee26e06e25d8313 diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index 8cd1506..951c37c 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -26,8 +26,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \ vcl \ )) -$(eval $(call gb_CppunitTest_unset_headless,cppcanvas_emfplus)) - $(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers)) $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\ @@ -36,7 +34,7 @@ $(eval $(call gb_CppunitTest_use_api,cppcanvas_emfplus,\ )) $(eval $(call gb_CppunitTest_use_ure,cppcanvas_emfplus)) -$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_emfplus)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless,cppcanvas_emfplus)) $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\ canvas/source/cairo/cairocanvas \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index c442601..622e16d 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -147,9 +147,32 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexcepti endef -define gb_CppunitTest_use_vcl +# $(2) == $(true) if headless: +define gb_CppunitTest__use_vcl $(call gb_CppunitTest_get_target,$(1)) : VCL := $(true) $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,vclbootstrapprotector) +ifeq ($(GUIBASE),unx) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,desktop_detector) +$(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \ +$(call gb_Library_get_target,vclplug_svp), \ +$(call gb_Library_get_target,vclplug_gen) \ +$(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \ +$(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \ +$(if $(ENABLE_KDE),$(call gb_Library_get_target,vclplug_kde)) \ +$(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \ +$(if $(ENABLE_TDE),$(call gb_Library_get_target,vclplug_tde))) +endif + +endef + +define gb_CppunitTest_use_vcl +$(call gb_CppunitTest__use_vcl,$(1),$(true)) + +endef + +define gb_CppunitTest_use_vcl_non_headless +$(call gb_CppunitTest_get_target,$(1)) : HEADLESS := +$(call gb_CppunitTest__use_vcl,$(1),$(false)) endef @@ -225,11 +248,6 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FO endef -define gb_CppunitTest_unset_headless -$(call gb_CppunitTest_get_target,$(1)) : HEADLESS= - -endef - # Use configuration in $(WORKDIR)/unittest/registry. define gb_CppunitTest_use_unittest_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 80a855d..09f6c3e 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -29,13 +29,6 @@ $(eval $(call gb_Library_use_libraries,subsequenttest,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),unx) -$(call gb_Library_get_target,subsequenttest) : \ -$(call gb_Library_get_target,desktop_detector) \ -$(call gb_Library_get_target,vclplug_svp) \ - -endif - $(eval $(call gb_Library_use_externals,subsequenttest,\ boost_headers \ cppunit \ diff --git a/test/Library_test.mk b/test/Library_test.mk index a9f91c9..585c7eb 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -35,13 +35,6 @@ $(eval $(call gb_Library_use_libraries,test,\ $(gb_UWINAPI) \ )) -ifeq ($(GUIBASE),unx) -$(call gb_Library_get_target,test) : \ -$(call gb_Library_get_target,desktop_detector) \ -$(call gb_Library_get_target,vclplug_svp) \ - -endif - $(eval $(call gb_Library_add_exception_objects,test,\ test/source/bootstrapfixture \ test/source/diff/diff \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
