Author: damjan
Date: Tue Feb 23 17:28:19 2016
New Revision: 1731909
URL: http://svn.apache.org/viewvc?rev=1731909&view=rev
Log:
We use Google Test now, not CppUnit.
Patch by: me
Added:
openoffice/branches/gbuild-reintegration/main/writerfilter/GoogleTest_writerfilter_doctok.mk
- copied, changed from r1731908,
openoffice/branches/gbuild-reintegration/main/writerfilter/CppunitTest_writerfilter_doctok.mk
Removed:
openoffice/branches/gbuild-reintegration/main/writerfilter/CppunitTest_writerfilter_doctok.mk
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
Copied:
openoffice/branches/gbuild-reintegration/main/writerfilter/GoogleTest_writerfilter_doctok.mk
(from r1731908,
openoffice/branches/gbuild-reintegration/main/writerfilter/CppunitTest_writerfilter_doctok.mk)
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/GoogleTest_writerfilter_doctok.mk?p2=openoffice/branches/gbuild-reintegration/main/writerfilter/GoogleTest_writerfilter_doctok.mk&p1=openoffice/branches/gbuild-reintegration/main/writerfilter/CppunitTest_writerfilter_doctok.mk&r1=1731908&r2=1731909&rev=1731909&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/CppunitTest_writerfilter_doctok.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/GoogleTest_writerfilter_doctok.mk
Tue Feb 23 17:28:19 2016
@@ -25,13 +25,13 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok))
+$(eval $(call gb_GoogleTest_GoogleTest,writerfilter_doctok))
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \
+$(eval $(call gb_GoogleTest_add_exception_objects,writerfilter_doctok, \
writerfilter/qa/cppunittests/doctok/testdoctok \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,writerfilter_doctok, \
+$(eval $(call gb_GoogleTest_add_linked_libs,writerfilter_doctok, \
writerfilter \
ucbhelper \
cppuhelper \
@@ -41,12 +41,12 @@ $(eval $(call gb_CppunitTest_add_linked_
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_add_api,writerfilter_doctok,\
+$(eval $(call gb_GoogleTest_add_api,writerfilter_doctok,\
udkapi \
offapi \
))
-$(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\
+$(eval $(call gb_GoogleTest_set_include,writerfilter_doctok,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(SRCDIR)/writerfilter/inc \
Modified:
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk?rev=1731909&r1=1731908&r2=1731909&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/writerfilter/Module_writerfilter.mk
Tue Feb 23 17:28:19 2016
@@ -36,7 +36,7 @@ $(eval $(call gb_Module_add_targets,writ
# does not build
$(eval $(call gb_Module_add_check_targets,writerfilter,\
- CppunitTest_writerfilter_doctok \
+ GoogleTest_writerfilter_doctok \
))
# does not run
