Author: damjan
Date: Sun Mar 6 20:29:55 2016
New Revision: 1733841
URL: http://svn.apache.org/viewvc?rev=1733841&view=rev
Log:
Merge r1409505 from branches/gbuild:
CWS gnumake4: add cppunittests for basebmp and basegfx
Also port the CppUnit tests to GTest.
BUILDS
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
- copied, changed from r1409505,
incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk
- copied, changed from r1733840,
openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk
Removed:
openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 20:29:55 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409504,1409507
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409507
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Copied:
openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
(from r1409505,
incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk?p2=openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk&p1=incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk&r1=1409505&r2=1733841&rev=1733841&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
Sun Mar 6 20:29:55 2016
@@ -25,15 +25,16 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test))
+$(eval $(call gb_GoogleTest_GoogleTest,basebmp_test))
-$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
+$(eval $(call gb_GoogleTest_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/main \
basebmp/test/masktest \
basebmp/test/polytest \
basebmp/test/tools \
@@ -49,16 +50,20 @@ $(eval $(call gb_CppunitTest_add_excepti
#.ENDIF
#.ENDIF
-$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
+$(eval $(call gb_GoogleTest_add_linked_libs,basebmp_test, \
basebmp \
sal \
stl \
basegfx \
- cppunit \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,basebmp_test,\
+$(eval $(call gb_GoogleTest_add_api,basebmp_test,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_GoogleTest_set_include,basebmp_test,\
$$(INCLUDE) \
))
Modified:
openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk?rev=1733841&r1=1733840&r2=1733841&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk Sun
Mar 6 20:29:55 2016
@@ -32,4 +32,11 @@ $(eval $(call gb_Module_add_targets,base
Package_inc \
))
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,basebmp,\
+ GoogleTest_basebmp \
+))
+endif
+
+
# vim: set noet sw=4 ts=4:
Copied:
openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk
(from r1733840,
openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk?p2=openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk&p1=openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk&r1=1733840&r2=1733841&rev=1733841&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/CppunitTest_basegfx.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/GoogleTest_basegfx.mk
Sun Mar 6 20:29:55 2016
@@ -25,17 +25,36 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME))
+$(eval $(call gb_GoogleTest_GoogleTest,basegfx_test))
-$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
+$(eval $(call gb_GoogleTest_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/main \
+ basegfx/test/testtools \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
+$(eval $(call gb_GoogleTest_add_linked_libs,basegfx_test, \
+ basegfx \
+ sal \
+ cppuhelper \
+ cppu \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
+$(eval $(call gb_GoogleTest_add_api,basegfx_test,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_GoogleTest_set_include,basegfx_test,\
$$(INCLUDE) \
+ -I$(SRCDIR)/basegfx/inc/pch \
))
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk?rev=1733841&r1=1733840&r2=1733841&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/Module_basegfx.mk Sun
Mar 6 20:29:55 2016
@@ -32,7 +32,10 @@ $(eval $(call gb_Module_add_targets,base
Package_inc \
))
+ifeq ($(ENABLE_UNIT_TESTS),YES)
$(eval $(call gb_Module_add_check_targets,basegfx,\
+ GoogleTest_basegfx \
))
+endif
# vim: set noet sw=4 ts=4:
Modified:
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk?rev=1733841&r1=1733840&r2=1733841&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/sfx2/GoogleTest_sfx2_metadatable.mk
Sun Mar 6 20:29:55 2016
@@ -39,11 +39,6 @@ $(eval $(call gb_GoogleTest_add_linked_l
$(gb_STDLIBS) \
))
-$(eval $(call gb_GoogleTest_set_include,sfx2_metadatable,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc \
-))
-
$(eval $(call gb_GoogleTest_set_ldflags,sfx2_metadatable,\
$$(LDFLAGS) \
))
