summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-04-08 13:40:35 +0200
committerDavid Tardon <dtardon@redhat.com>2012-04-08 14:53:09 +0200
commite3cf2b45f700fc5f4d19790b4b29175b33d38048 (patch)
tree5909ee994b4f9cb7bb0a417577d4c5efd22ec97b /dbaccess
parente5f16b8d3e4b0fc3c772c7cfdd0abdf3a749650e (diff)
simplify use of configuration from unit tests
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/CppunitTest_dbaccess_macros_test.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 60cc0e1164c6..395075f4a434 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_set_args,dbaccess_macros_test,\
- "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry)" \
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,dbaccess_macros_test,\
+ $(OUTDIR)/unittest/registry \
))
- # .../spool is required for the (somewhat strange) filter configuration
# we need to
# a) explicitly depend on library msword because it is not implied by a link