diff options
28 files changed, 31 insertions, 84 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 0f6e9de26ec4..1b7c4b405ebd 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test)) # we need to # - explicitly depend on the dbaccess resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index b298628fcb5b..cbffc92939e7 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj)) $(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sc_annonationshapeobj,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annonationshapeobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 78e4aa0e6da0..17e5f2766dfd 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -123,9 +123,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangesbase)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index 3e3d580c2d68..f27fb2fc6cbd 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -128,9 +128,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test)) $(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2)) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 2374d97cce34..606c205d1da7 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 57286e14b693..5031a8bd8e08 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 55324fd6bb6e..2f5b11ddd1e6 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index 70ca94ce7abb..a3604a4e0fba 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell)) $(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_cell)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sc_editfieldobj_cell,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 301c8f0c569f..85235b7b2d7d 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -122,9 +122,7 @@ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header)) $(eval $(call gb_CppunitTest_use_filter_configuration,sc_editfieldobj_header)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sc_editfieldobj_header,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 7d1a8fbd241c..a19403f4bd92 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -120,9 +120,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 94118944e8c6..bb1f6914210c 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 048002ecf6ef..4cd080fb4488 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index 2e69600facd0..8be35a47f1cf 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tableautoformatfield)) # we need to # - explicitly depend on the sc resource files needed at unit-test runtime diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index fdb230a77b3b..f2e7c52e66be 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -123,9 +123,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetobj)) # we need to explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_spreadsheetobj) : $(WORKDIR)/AllLangRes/sc diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 9c58bc205f79..5ef9a01d6df2 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -122,9 +122,7 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_spreadsheetsobj)) # we need to explicitly depend on the sc resource files needed at unit-test runtime $(call gb_CppunitTest_get_target,sc_spreadsheetsobj) : $(WORKDIR)/AllLangRes/sc diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 56b480a0b3f9..af34ec512982 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -124,9 +124,7 @@ $(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_use_unittest_configuration,sd_regression_test)) $(eval $(call gb_CppunitTest_add_arguments,sd_regression_test,\ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 190e40be73c2..49bc472eb445 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -280,9 +280,10 @@ $(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry endef -# Use extra configuration dir(s). -define gb_CppunitTest_use_extra_configuration -$(foreach extra,$(2),$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(extra))) +# Use configuration in $(OUTDIR)/unittest/registry. +define gb_CppunitTest_use_unittest_configuration +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) +$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry) endef diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 1d97f48c223b..6d0b024ef5c5 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -119,8 +119,6 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_layout_test)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index bd754e9db2e4..c8d94e795018 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -121,8 +121,6 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index 4712e00e10b6..d4e28d66bc71 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -121,8 +121,6 @@ $(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 \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_regression_test)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 21739e79dc98..a59be4022800 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -91,8 +91,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfexport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index 84ee9f7823ae..cba3ebd24779 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -90,8 +90,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfimport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index 4e63fb451757..eafc644b6a5f 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -95,8 +95,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlexport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlexport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index 8e5e3ef8c530..2fb7c3fd6cc4 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -92,8 +92,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlimport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index a0dd4518fbc4..fb787a3c4cea 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -92,8 +92,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfexport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfexport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfexport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 33b23036f0d7..f3670d557cfe 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -88,8 +88,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfimport,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfimport)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index 379091a46bdf..687ef9432582 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8export,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8export)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index cb70e393ce57..24d3e50057f3 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -88,8 +88,6 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import)) $(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import)) -$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8import,\ - $(OUTDIR)/unittest/registry \ -)) +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8import)) # vim: set noet sw=4 ts=4: |