CppunitTest_cppcanvas_test: enable even if cairo canvas is not
I want to add more tests to it. Change-Id: Ibadfbafbaa6d6b1cfc1f9aa3761a04de2e2c1f09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153262 Tested-by: Jenkins Reviewed-by: خالد حسني <khaled@libreoffice.org>
This commit is contained in:
parent
cf69509628
commit
fc72d1d0c6
3 changed files with 5 additions and 3 deletions
|
@ -39,7 +39,7 @@ $(eval $(call gb_CppunitTest_use_ure,cppcanvas_test))
|
|||
$(eval $(call gb_CppunitTest_use_vcl,cppcanvas_test))
|
||||
|
||||
$(eval $(call gb_CppunitTest_use_components,cppcanvas_test,\
|
||||
canvas/source/cairo/cairocanvas \
|
||||
$(if $(ENABLE_CAIRO_CANVAS),canvas/source/cairo/cairocanvas) \
|
||||
canvas/source/factory/canvasfactory \
|
||||
configmgr/source/configmgr \
|
||||
i18npool/util/i18npool \
|
||||
|
|
|
@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,cppcanvas,\
|
|||
))
|
||||
|
||||
# FIXME: should generalize these ...
|
||||
ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
|
||||
$(eval $(call gb_Module_add_check_targets,cppcanvas,\
|
||||
CppunitTest_cppcanvas_test \
|
||||
))
|
||||
|
||||
ifeq ($(ENABLE_CAIRO_CANVAS),TRUE)
|
||||
ifneq ($(DISPLAY),)
|
||||
$(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
|
||||
CppunitTest_cppcanvas_emfplus \
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
|
||||
#include <config_cairo_canvas.h>
|
||||
|
||||
#include <sal/config.h>
|
||||
|
||||
#include <test/bootstrapfixture.hxx>
|
||||
|
@ -28,7 +30,7 @@ public:
|
|||
|
||||
CPPUNIT_TEST_FIXTURE(CanvasTest, testComposite)
|
||||
{
|
||||
#ifdef LINUX
|
||||
#if ENABLE_CAIRO_CANVAS
|
||||
ScopedVclPtrInstance<WorkWindow> pWin( nullptr, WB_STDWORK );
|
||||
|
||||
uno::Reference<rendering::XCanvas> xCanvas = pWin->GetOutDev()->GetCanvas ();
|
||||
|
|
Loading…
Reference in a new issue