diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:09:41 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 18:34:22 +0200 |
commit | 977ea14f37c4d53668ed89ed79009b1e15fcb8a6 (patch) | |
tree | 9189c3148cfaf30e2abfd3b8059151770f2ba45e | |
parent | 952e758d47aa7b50a74e4a068723e47c7a8adc7e (diff) |
adapt sw unittests to separate RdbTarget makefile requirement
-rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 22 | ||||
-rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 16 | ||||
-rw-r--r-- | sw/Module_sw.mk | 2 | ||||
-rw-r--r-- | sw/RdbTarget_sw_filters_test.mk | 53 | ||||
-rw-r--r-- | sw/RdbTarget_sw_swdoc_test.mk | 47 |
5 files changed, 102 insertions, 38 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 6541bf75ffaa..720adae32a90 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -87,28 +87,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) -$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test)) - -$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\ - sw/util/sw \ - sw/util/msword \ - forms/util/frm \ - dbaccess/util/dba \ - sfx2/util/sfx \ - framework/util/fwk \ - toolkit/util/tk \ - unoxml/source/service/unoxml \ - fileaccess/source/fileacc \ - comphelper/util/comphelp \ - i18npool/util/i18npool \ - package/util/package2 \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\ - ucb1 \ - ucpfile1 \ -)) - # we need to explicitly depend on library msword because it is not implied # by a link relation $(call gb_CppunitTest_get_target,sw_filters_test) : $(call gb_Library_get_target,msword) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index d1ea1d3e06c0..aec009658a9b 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -105,22 +105,6 @@ $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ )) -$(eval $(call gb_RdbTarget_RdbTarget,sw_swdoc_test)) - -$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\ - sfx2/util/sfx \ - framework/util/fwk \ - unoxml/source/service/unoxml \ - fileaccess/source/fileacc \ - comphelper/util/comphelp \ - i18npool/util/i18npool \ -)) - -$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\ - ucb1 \ - ucpfile1 \ -)) - # we need to explicitly depend on the sw resource files needed at unit-test # runtime $(call gb_CppunitTest_get_target,sw_swdoc_test) : $(WORKDIR)/AllLangRes/sw diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index c66b92e37193..90d8a0c17d78 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -43,6 +43,8 @@ $(eval $(call gb_Module_add_targets,sw,\ $(eval $(call gb_Module_add_check_targets,sw,\ CppunitTest_sw_filters_test \ CppunitTest_sw_swdoc_test \ + RdbTarget_sw_filters_test \ + RdbTarget_sw_swdoc_test \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ diff --git a/sw/RdbTarget_sw_filters_test.mk b/sw/RdbTarget_sw_filters_test.mk new file mode 100644 index 000000000000..3fdee3c36a64 --- /dev/null +++ b/sw/RdbTarget_sw_filters_test.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +#************************************************************************* + +$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test)) + +$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\ + sw/util/sw \ + sw/util/msword \ + forms/util/frm \ + dbaccess/util/dba \ + sfx2/util/sfx \ + framework/util/fwk \ + toolkit/util/tk \ + unoxml/source/service/unoxml \ + fileaccess/source/fileacc \ + comphelper/util/comphelp \ + i18npool/util/i18npool \ + package/util/package2 \ +)) + +$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\ + ucb1 \ + ucpfile1 \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/RdbTarget_sw_swdoc_test.mk b/sw/RdbTarget_sw_swdoc_test.mk new file mode 100644 index 000000000000..34dbdc49bb7c --- /dev/null +++ b/sw/RdbTarget_sw_swdoc_test.mk @@ -0,0 +1,47 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +#************************************************************************* + +$(eval $(call gb_RdbTarget_RdbTarget,sw_swdoc_test)) + +$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\ + sfx2/util/sfx \ + framework/util/fwk \ + unoxml/source/service/unoxml \ + fileaccess/source/fileacc \ + comphelper/util/comphelp \ + i18npool/util/i18npool \ +)) + +$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\ + ucb1 \ + ucpfile1 \ +)) + +# vim: set noet sw=4 ts=4: |