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 /sw/CppunitTest_sw_layout_test.mk | |
parent | e5f16b8d3e4b0fc3c772c7cfdd0abdf3a749650e (diff) |
simplify use of configuration from unit tests
Diffstat (limited to 'sw/CppunitTest_sw_layout_test.mk')
-rw-r--r-- | sw/CppunitTest_sw_layout_test.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 44728dfb0145..c3540adf9ca9 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -113,10 +113,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ unoxml/source/service/unoxml \ )) -$(eval $(call gb_CppunitTest_set_args,sw_layout_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,sw_layout_test)) + +$(eval $(call gb_CppunitTest_use_filter_configuration,sw_layout_test)) + +$(eval $(call gb_CppunitTest_use_extra_configuration,sw_layout_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 |