diff options
| -rw-r--r-- | ucb/CppunitTest_ucb_webdav_core.mk (renamed from ucb/CppunitTest_ucb_webdav_res_access.mk) | 24 | ||||
| -rw-r--r-- | ucb/CppunitTest_ucb_webdav_local_neon.mk | 52 | ||||
| -rw-r--r-- | ucb/CppunitTest_ucb_webdav_neon_opts.mk | 55 | ||||
| -rw-r--r-- | ucb/CppunitTest_ucb_webdav_propfindcache.mk | 55 | ||||
| -rw-r--r-- | ucb/Module_ucb.mk | 5 | ||||
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 4 | ||||
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_options.cxx | 4 | ||||
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_propfindcache.cxx | 4 | ||||
| -rw-r--r-- | ucb/qa/cppunit/webdav/webdav_resource_access.cxx | 2 |
9 files changed, 16 insertions, 189 deletions
diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_core.mk index dd335a6ff065..fbd3f59f55f6 100644 --- a/ucb/CppunitTest_ucb_webdav_res_access.mk +++ b/ucb/CppunitTest_ucb_webdav_core.mk @@ -9,14 +9,11 @@ # #************************************************************************* -$(eval $(call gb_CppunitTest_CppunitTest,ucb_webdav_res_access)) +$(eval $(call gb_CppunitTest_CppunitTest,ucb_webdav_core)) -$(eval $(call gb_CppunitTest_use_api,ucb_webdav_res_access, \ - offapi \ - udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,ucb_webdav_core)) -$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_res_access, \ +$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_core, \ comphelper \ cppu \ cppuhelper \ @@ -27,29 +24,30 @@ $(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_res_access, \ tl \ )) -$(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_res_access, \ +$(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_core, \ ucpdav1 \ )) -$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\ +$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_core,\ boost_headers \ libxml2 \ curl \ )) -$(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\ +$(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_core,\ officecfg/registry \ )) -$(eval $(call gb_CppunitTest_add_exception_objects,ucb_webdav_res_access, \ +$(eval $(call gb_CppunitTest_add_exception_objects,ucb_webdav_core, \ ucb/qa/cppunit/webdav/webdav_resource_access \ + ucb/qa/cppunit/webdav/webdav_propfindcache \ + ucb/qa/cppunit/webdav/webdav_options \ + ucb/qa/cppunit/webdav/webdav_local_neon \ )) -$(eval $(call gb_CppunitTest_set_include,ucb_webdav_res_access,\ +$(eval $(call gb_CppunitTest_set_include,ucb_webdav_core,\ $$(INCLUDE) \ -I$(SRCDIR)/ucb/source/ucp/webdav-curl \ )) -$(eval $(call gb_CppunitTest_use_static_libraries,ucb_webdav_res_access)) - # vim: set noet sw=4 ts=4: diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk deleted file mode 100644 index b9b6d5d448ef..000000000000 --- a/ucb/CppunitTest_ucb_webdav_local_neon.mk +++ /dev/null @@ -1,52 +0,0 @@ -# -*- 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,ucb_webdav_local_neon)) - -$(eval $(call gb_CppunitTest_use_sdk_api,ucb_webdav_local_neon)) - -$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_local_neon, \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - salhelper \ - test \ - ucbhelper \ - tl \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_local_neon, \ - ucpdav1 \ -)) - -$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\ - boost_headers \ - libxml2 \ - curl \ -)) - -$(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\ - officecfg/registry \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,ucb_webdav_local_neon, \ - ucb/qa/cppunit/webdav/webdav_local_neon \ -)) - -$(eval $(call gb_CppunitTest_set_include,ucb_webdav_local_neon,\ - $$(INCLUDE) \ - -I$(SRCDIR)/ucb/source/ucp/webdav-curl \ -)) - -$(eval $(call gb_CppunitTest_use_static_libraries,ucb_webdav_local_neon)) - -# vim: set noet sw=4 ts=4: diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk deleted file mode 100644 index ba77a4c59a42..000000000000 --- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk +++ /dev/null @@ -1,55 +0,0 @@ -# -*- 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,ucb_webdav_neon_opts)) - -$(eval $(call gb_CppunitTest_use_api,ucb_webdav_neon_opts, \ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_neon_opts, \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - salhelper \ - test \ - ucbhelper \ - tl \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_neon_opts, \ - ucpdav1 \ -)) - -$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\ - boost_headers \ - libxml2 \ - curl \ -)) - -$(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\ - officecfg/registry \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,ucb_webdav_neon_opts, \ - ucb/qa/cppunit/webdav/webdav_options \ -)) - -$(eval $(call gb_CppunitTest_set_include,ucb_webdav_neon_opts,\ - $$(INCLUDE) \ - -I$(SRCDIR)/ucb/source/ucp/webdav-curl \ -)) - -$(eval $(call gb_CppunitTest_use_static_libraries,ucb_webdav_neon_opts)) - -# vim: set noet sw=4 ts=4: diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk deleted file mode 100644 index 4e9ad0668829..000000000000 --- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk +++ /dev/null @@ -1,55 +0,0 @@ -# -*- 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,ucb_webdav_propfindcache)) - -$(eval $(call gb_CppunitTest_use_api,ucb_webdav_propfindcache, \ - offapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_propfindcache, \ - comphelper \ - cppu \ - cppuhelper \ - sal \ - salhelper \ - test \ - ucbhelper \ - tl \ -)) - -$(eval $(call gb_CppunitTest_use_library_objects,ucb_webdav_propfindcache, \ - ucpdav1 \ -)) - -$(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\ - boost_headers \ - libxml2 \ - curl \ -)) - -$(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\ - officecfg/registry \ -)) - -$(eval $(call gb_CppunitTest_add_exception_objects,ucb_webdav_propfindcache, \ - ucb/qa/cppunit/webdav/webdav_propfindcache \ -)) - -$(eval $(call gb_CppunitTest_set_include,ucb_webdav_propfindcache,\ - $$(INCLUDE) \ - -I$(SRCDIR)/ucb/source/ucp/webdav-curl \ -)) - -$(eval $(call gb_CppunitTest_use_static_libraries,ucb_webdav_propfindcache)) - -# vim: set noet sw=4 ts=4: diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk index 6e630e9c6342..19c1aec96591 100644 --- a/ucb/Module_ucb.mk +++ b/ucb/Module_ucb.mk @@ -34,10 +34,7 @@ endif ifeq ($(WITH_WEBDAV),curl) $(eval $(call gb_Module_add_check_targets,ucb,\ - CppunitTest_ucb_webdav_local_neon \ - CppunitTest_ucb_webdav_neon_opts \ - CppunitTest_ucb_webdav_propfindcache \ - CppunitTest_ucb_webdav_res_access \ + CppunitTest_ucb_webdav_core \ )) endif diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx index a2208ffaccad..08a384dee36b 100644 --- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx +++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx @@ -57,8 +57,6 @@ namespace } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_local_test ); -} // namespace rtl_random - -CPPUNIT_PLUGIN_IMPLEMENT(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/qa/cppunit/webdav/webdav_options.cxx b/ucb/qa/cppunit/webdav/webdav_options.cxx index 7fd0e7dedd13..d8e3d0946c77 100644 --- a/ucb/qa/cppunit/webdav/webdav_options.cxx +++ b/ucb/qa/cppunit/webdav/webdav_options.cxx @@ -362,8 +362,6 @@ namespace } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_opts_test ); -} // namespace rtl_random - -CPPUNIT_PLUGIN_IMPLEMENT(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx index a9f24345e33c..da790442e744 100644 --- a/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx +++ b/ucb/qa/cppunit/webdav/webdav_propfindcache.cxx @@ -128,8 +128,6 @@ namespace } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_propcache_test ); -} // namespace rtl_random - -CPPUNIT_PLUGIN_IMPLEMENT(); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/qa/cppunit/webdav/webdav_resource_access.cxx b/ucb/qa/cppunit/webdav/webdav_resource_access.cxx index 85d3e1c236a6..2379139c04a3 100644 --- a/ucb/qa/cppunit/webdav/webdav_resource_access.cxx +++ b/ucb/qa/cppunit/webdav/webdav_resource_access.cxx @@ -96,7 +96,7 @@ namespace } CPPUNIT_TEST_SUITE_REGISTRATION( webdav_resource_access_test ); -} // namespace rtl_random +} CPPUNIT_PLUGIN_IMPLEMENT(); |