adapt sc unittests to separate RdbTarget makefile requirement, also rename sc_test_filters consistent to sc_filters_test

5 files changed, 113 insertions, 48 deletions

diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_filters_test.mk
index a2b56935f4b5..a1646968b6ab 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -97,39 +97,6 @@ $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
     -env:OOO_CONFIG_REGISTRY_DIR=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) \
 ))
 
-$(eval $(call gb_RdbTarget_RdbTarget,sc_filters_test))
-
-$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
-    basic/util/sb \
-    comphelper/util/comphelp \
-    dbaccess/util/dba \
-    fileaccess/source/fileacc \
-    filter/source/config/cache/filterconfig1 \
-    forms/util/frm \
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    oox/util/oox \
-    package/source/xstor/xstor \
-    package/util/package2 \
-    sax/source/expatwrap/expwrap \
-    sax/source/fastparser/fastsax \
-    sc/util/sc \
-    sc/util/scfilt \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
-    sfx2/util/sfx \
-    toolkit/util/tk \
-    unotools/util/utl \
-    unoxml/source/rdf/unordf \
-    unoxml/source/service/unoxml \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
-    configmgr \
-    ucb1 \
-    ucpfile1 \
-))
-
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
 #    relation
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 5bd1e5c160dc..08f0ed80dd0c 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -102,18 +102,4 @@ $(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
     --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
 ))
 
-$(eval $(call gb_RdbTarget_RdbTarget,sc_ucalc))
-
-$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\
-    framework/util/fwk \
-    i18npool/util/i18npool \
-    sfx2/util/sfx \
-    unoxml/source/service/unoxml \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\
-    ucb1 \
-    ucpfile1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 8ecdf25eca5d..1edf6465592d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -35,8 +35,10 @@ $(eval $(call gb_Module_add_targets,sc,\
 ))
 
 $(eval $(call gb_Module_add_check_targets,sc,\
+	CppunitTest_sc_filters_test \
 	CppunitTest_sc_ucalc \
-	CppunitTest_sc_test_filters \
+	RdbTarget_sc_filters_test \
+	RdbTarget_sc_ucalc \
 ))
 
 
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
new file mode 100644
index 000000000000..a0d32bbd2420
--- /dev/null
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -0,0 +1,64 @@
+# -*- 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,sc_filters_test))
+
+$(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
+    basic/util/sb \
+    comphelper/util/comphelp \
+    dbaccess/util/dba \
+    fileaccess/source/fileacc \
+    filter/source/config/cache/filterconfig1 \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    sax/source/fastparser/fastsax \
+    sc/util/sc \
+    sc/util/scfilt \
+    scripting/source/basprov/basprov \
+    scripting/util/scriptframe \
+    sfx2/util/sfx \
+    toolkit/util/tk \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
+    configmgr \
+    ucb1 \
+    ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/RdbTarget_sc_ucalc.mk b/sc/RdbTarget_sc_ucalc.mk
new file mode 100644
index 000000000000..c33f4a0d46ee
--- /dev/null
+++ b/sc/RdbTarget_sc_ucalc.mk
@@ -0,0 +1,46 @@
+# -*- 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
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+#
+# 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,sc_ucalc))
+
+$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    sfx2/util/sfx \
+    unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\
+    ucb1 \
+    ucpfile1 \
+))
+
+# vim: set noet sw=4 ts=4: