simplify use of configuration from unit tests

7 files changed, 32 insertions, 19 deletions

diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 5400cdefda03..bf616828e458 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -90,9 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
     xmlhelp/util/ucpchelp1 \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
 
 # we need to explicitly depend on library msword because it is not implied
 # by a link relation
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
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 9be7339802a2..f7a053b8e9e1 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -115,10 +115,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_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,sw_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_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
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 9d37f66b8346..e1d35d8999a1 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -115,10 +115,13 @@ $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_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)" \
+$(eval $(call gb_CppunitTest_use_configuration,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_regression_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_regression_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
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
index 21cfbff4bac6..db72f14b7918 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk
@@ -74,8 +74,12 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_subsequent_ooxmltok,\
-    "-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_subsequent_ooxmltok))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmltok))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmltok,\
+	$(OUTDIR)/unittest/registry \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk
index 9689d049cc5e..a3e0f86f7a87 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -68,8 +68,12 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_subsequent_rtftok,\
-    "-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_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtftok,\
+	$(OUTDIR)/unittest/registry \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index cb22c627a08b..7629d1afd66e 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -97,9 +97,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sw_swdoc_test))
 
 # we need to explicitly depend on the sw resource files needed at unit-test
 # runtime