simplify use of configuration from unit tests

14 files changed, 73 insertions, 44 deletions

diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk
index eb95f867536f..a4ee45a10ff9 100644
--- a/sc/CppunitTest_sc_cellrangeobj.mk
+++ b/sc/CppunitTest_sc_cellrangeobj.mk
@@ -118,10 +118,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangesbase,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
-    "-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,sc_cellrangesbase))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_cellrangesbase))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_cellrangesbase,\
+	$(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/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
index 37c5915ea890..4d4da30e004b 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -124,10 +124,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_chart_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,sc_chart_regression_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_chart_regression_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_chart_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/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index a8292a341d67..ff2f4e8cc3ee 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\
-    "-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,sc_databaserangeobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_databaserangeobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_databaserangeobj,\
+	$(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/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 5eb0350b1e31..096b37f4bc02 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
-    "-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,sc_datapilotfieldobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilotfieldobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilotfieldobj,\
+	$(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/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk
index 29ec3b930c0c..921b576864ef 100644
--- a/sc/CppunitTest_sc_datapilottableobj.mk
+++ b/sc/CppunitTest_sc_datapilottableobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_datapilottableobj,\
-    "-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,sc_datapilottableobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_datapilottableobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_datapilottableobj,\
+	$(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/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index b1466477460a..a200570abe5c 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -116,10 +116,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_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,sc_filters_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 4a87930aa913..bdfd820a350b 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -113,10 +113,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_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,sc_macros_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_macros_test))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_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/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index 34689a54a07d..33cd57d050fa 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
-    "-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,sc_namedrangeobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangeobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangeobj,\
+	$(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/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk
index 03addcfb7481..1e6024090521 100644
--- a/sc/CppunitTest_sc_namedrangesobj.mk
+++ b/sc/CppunitTest_sc_namedrangesobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_namedrangesobj,\
-    "-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,sc_namedrangesobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_namedrangesobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_namedrangesobj,\
+	$(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/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index fb0436fe7b1a..d814ddab6d7e 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -129,10 +129,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
 endif
 endif
 
-$(eval $(call gb_CppunitTest_set_args,sc_subsequent_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,sc_subsequent_filters_test))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_subsequent_filters_test))
 
 # we need to
 # a) explicitly depend on library msword because it is not implied by a link
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index daadfb1b172e..2e5a2c706b19 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_tableautoformatfield,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
-    "-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,sc_tableautoformatfield))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_tableautoformatfield))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_tableautoformatfield,\
+	$(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/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk
index f2f72e1849c0..b35754869e98 100644
--- a/sc/CppunitTest_sc_tablesheetobj.mk
+++ b/sc/CppunitTest_sc_tablesheetobj.mk
@@ -118,10 +118,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\
-    "-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,sc_spreadsheetobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetobj,\
+	$(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/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk
index a58afd30a81f..57947934bc1d 100644
--- a/sc/CppunitTest_sc_tablesheetsobj.mk
+++ b/sc/CppunitTest_sc_tablesheetsobj.mk
@@ -116,10 +116,13 @@ $(eval $(call gb_CppunitTest_use_components,sc_spreadsheetsobj,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetsobj,\
-    "-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,sc_spreadsheetsobj))
+
+$(eval $(call gb_CppunitTest_use_filter_configuration,sc_spreadsheetsobj))
+
+$(eval $(call gb_CppunitTest_use_extra_configuration,sc_spreadsheetsobj,\
+	$(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/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index b0d2e6ad87e7..2185f8232bf8 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -97,8 +97,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
-    "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
-))
+$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc))
 
 # vim: set noet sw=4 ts=4: