diff options
| -rw-r--r-- | basebmp/CppunitTest_basebmp.mk | 65 | ||||
| -rw-r--r-- | basebmp/Module_basebmp.mk | 5 | ||||
| -rw-r--r-- | basebmp/test/basictest.cxx | 1 | ||||
| -rw-r--r-- | basegfx/CppunitTest_basegfx.mk | 23 | ||||
| -rw-r--r-- | basegfx/Module_basegfx.mk | 1 | ||||
| -rw-r--r-- | basegfx/test/basegfx1d.cxx | 1 |
6 files changed, 92 insertions, 4 deletions
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk new file mode 100644 index 000000000000..878b14bf8d3a --- /dev/null +++ b/basebmp/CppunitTest_basebmp.mk @@ -0,0 +1,65 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \ + basebmp/test/basictest \ + basebmp/test/bmpmasktest \ + basebmp/test/bmptest \ + basebmp/test/cliptest \ + basebmp/test/filltest \ + basebmp/test/linetest \ + basebmp/test/masktest \ + basebmp/test/polytest \ + basebmp/test/tools \ +)) + +# TODO +# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail +# if compiled with default -xalias_level (and optimization level -xO3) +#.IF "$(OS)"=="SOLARIS" +# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx +#.IF "$(CCNUMVER)"!="00050005" +#CDEFS+=-xalias_level=compatible +#.ENDIF +#.ENDIF + +$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \ + basebmp \ + sal \ + stl \ + basegfx \ + cppunit \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,basebmp_test,\ + $$(INCLUDE) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk index 284544863cee..0329d1cc358f 100644 --- a/basebmp/Module_basebmp.mk +++ b/basebmp/Module_basebmp.mk @@ -32,4 +32,9 @@ $(eval $(call gb_Module_add_targets,basebmp,\ Package_inc \ )) +$(eval $(call gb_Module_add_check_targets,basebmp,\ + CppunitTest_basebmp \ +)) + + # vim: set noet sw=4 ts=4: diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index a9c533a3a134..d7581a9139c7 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -28,6 +28,7 @@ // autogenerated file with codegen.pl #include "preextstl.h" +#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk index e31b025b1f54..ed5403dd5601 100644 --- a/basegfx/CppunitTest_basegfx.mk +++ b/basegfx/CppunitTest_basegfx.mk @@ -25,17 +25,32 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME)) +$(eval $(call gb_CppunitTest_CppunitTest,basegfx_test)) -$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \ +$(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \ + basegfx/test/basegfx1d \ + basegfx/test/basegfx2d \ + basegfx/test/basegfx3d \ + basegfx/test/boxclipper \ + basegfx/test/basegfxtools \ + basegfx/test/clipstate \ + basegfx/test/genericclipper \ + basegfx/test/testtools \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \ +$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \ + basegfx \ + sal \ + cppuhelper \ + cppunit \ + cppu \ $(gb_STDLIBS) \ )) -$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\ +$(eval $(call gb_CppunitTest_set_include,basegfx_test,\ $$(INCLUDE) \ + -I$(SRCDIR)/basegfx/inc/pch \ + -I$(OUTDIR)/inc/offuh \ )) # vim: set noet sw=4 ts=4: diff --git a/basegfx/Module_basegfx.mk b/basegfx/Module_basegfx.mk index 91f173ea8a25..5f63b47fb69c 100644 --- a/basegfx/Module_basegfx.mk +++ b/basegfx/Module_basegfx.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,basegfx,\ )) $(eval $(call gb_Module_add_check_targets,basegfx,\ + CppunitTest_basegfx \ )) # vim: set noet sw=4 ts=4: diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 9b189bd8b236..0c5cf82a7107 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -31,6 +31,7 @@ // autogenerated file with codegen.pl #include "preextstl.h" +#include <sal/cppunit.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" |