diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 13:40:35 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 14:53:09 +0200 |
| commit | e3cf2b45f700fc5f4d19790b4b29175b33d38048 (patch) | |
| tree | 5909ee994b4f9cb7bb0a417577d4c5efd22ec97b /sd | |
| parent | e5f16b8d3e4b0fc3c772c7cfdd0abdf3a749650e (diff) | |
simplify use of configuration from unit tests
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 7 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_regression_test.mk | 10 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 46ad622a7464..9af86e0a1079 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -106,10 +106,9 @@ $(eval $(call gb_CppunitTest_use_components,sd_filters_test,\ unoxml/source/service/unoxml \ )) -$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\ - "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool)" \ -)) - # .../spool is required for the (somewhat strange) filter configuration +$(eval $(call gb_CppunitTest_use_configuration,sd_filters_test)) + +$(eval $(call gb_CppunitTest_use_filter_configuration,sd_filters_test)) # we need to explicitly depend on library sdfilt because it is not implied # by a link relation diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 2716c50e9f7a..4b24b2550c80 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -116,11 +116,17 @@ $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ xmlsecurity/util/xmlsecurity \ )) +$(eval $(call gb_CppunitTest_use_configuration,sd_regression_test)) + +$(eval $(call gb_CppunitTest_use_filter_configuration,sd_regression_test)) + +$(eval $(call gb_CppunitTest_use_extra_configuration,sd_regression_test,\ + $(OUTDIR)/unittest/registry \ +)) + $(eval $(call gb_CppunitTest_set_args,sd_regression_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)" \ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) - # .../spool is required for the (somewhat strange) filter configuration # we need to explicitly depend on library sdfilt because it is not implied # by a link relation diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 658a240292aa..86ba05e6f90c 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -82,8 +82,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_uimpress,\ i18npool/util/i18npool \ )) -$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ - "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \ -)) +$(eval $(call gb_CppunitTest_use_configuration,sd_uimpress)) # vim: set noet sw=4 ts=4: |