diff options
57 files changed, 9 insertions, 114 deletions
diff --git a/chart2/CppunitTest_chart2_export.mk b/chart2/CppunitTest_chart2_export.mk index a1a4bd6bac8c..51ce6b651300 100644 --- a/chart2/CppunitTest_chart2_export.mk +++ b/chart2/CppunitTest_chart2_export.mk @@ -132,6 +132,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_export,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_export)) - # vim: set noet sw=4 ts=4: diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk index 50d58f2f10e5..e101993e9eb4 100644 --- a/chart2/CppunitTest_chart2_import.mk +++ b/chart2/CppunitTest_chart2_import.mk @@ -130,8 +130,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_import)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_import)) - $(call gb_CppunitTest_get_target,chart2_import): \ $(call gb_AllLangResTarget_get_target,sd) diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index 99149a6e0cb2..bb50d5b59608 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -127,6 +127,4 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\ $(eval $(call gb_CppunitTest_use_configuration,chart2_xshape)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_xshape)) - # vim: set noet sw=4 ts=4: diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index b47960913ca9..d4cc7c1add5d 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -62,8 +62,6 @@ $(eval $(call gb_CppunitTest_use_components,cppcanvas_emfplus,\ $(eval $(call gb_CppunitTest_use_configuration,cppcanvas_emfplus)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,cppcanvas_emfplus)) - $(call gb_CppunitTest_get_target,cppcanvas_emfplus): \ $(call gb_AllLangResTarget_get_target,ofa) \ $(call gb_AllLangResTarget_get_target,sd) diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index e27b0bde54e7..3a149e016f2e 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_RowSetClones)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_RowSetClones)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_RowSetClones)) - $(call gb_CppunitTest_get_target,dbaccess_RowSetClones) : $(WORKDIR)/CppunitTest/RowSetClones.odb $(WORKDIR)/CppunitTest/RowSetClones.odb : $(SRCDIR)/dbaccess/qa/extras/testdocuments/RowSetClones.odb mkdir -p $(dir $@) diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index e18a5ebf3cc6..e4dfbb1b621b 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialog_save)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_dialog_save)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_dialog_save)) - $(call gb_CppunitTest_get_target,dbaccess_dialog_save) : $(WORKDIR)/CppunitTest/testDialogSave.odb $(WORKDIR)/CppunitTest/testDialogSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdocuments/testDialogSave.odb mkdir -p $(dir $@) diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 2fe7e9476132..20d5754e4137 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -76,6 +76,4 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_embeddeddb_performancete $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_embeddeddb_performancetest)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_embeddeddb_performancetest)) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk index 408c0bfdb493..7113ce7668a4 100644 --- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_empty_stdlib_save)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_empty_stdlib_save)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_empty_stdlib_save)) - $(call gb_CppunitTest_get_target,dbaccess_empty_stdlib_save) : $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb $(WORKDIR)/CppunitTest/testEmptyStdlibSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdocuments/testDialogSave.odb mkdir -p $(dir $@) diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 68351a7c54f3..f438dfd12d85 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -66,6 +66,4 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_firebird_test)) - # vim: set noet sw=4 ts=4: diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 9cc471842d3f..9e15e94eb7f2 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -80,8 +80,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_hsqldb_test)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_hsqldb_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_hsqldb_test)) - $(call gb_CppunitTest_get_target,dbaccess_hsqldb_test): \ $(call gb_AllLangResTarget_get_target,ofa) diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 9b2166faffad..398dd5b7b986 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -104,8 +104,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_macros_test)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_macros_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_macros_test)) - $(call gb_CppunitTest_get_target,dbaccess_macros_test): \ $(call gb_AllLangResTarget_get_target,ofa) diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 6684d724f34a..7e7c7429e30c 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -105,8 +105,6 @@ $(eval $(call gb_CppunitTest_use_configuration,dbaccess_nolib_save)) $(eval $(call gb_CppunitTest_use_filter_configuration,dbaccess_nolib_save)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,dbaccess_nolib_save)) - $(call gb_CppunitTest_get_target,dbaccess_nolib_save) : $(WORKDIR)/CppunitTest/testNolibSave.odb $(WORKDIR)/CppunitTest/testNolibSave.odb : $(SRCDIR)/dbaccess/qa/extras/testdocuments/testDialogSave.odb mkdir -p $(dir $@) diff --git a/postprocess/CppunitTest_services.mk b/postprocess/CppunitTest_services.mk index afd940a897da..a0e5749c137a 100644 --- a/postprocess/CppunitTest_services.mk +++ b/postprocess/CppunitTest_services.mk @@ -41,8 +41,6 @@ endif $(eval $(call gb_CppunitTest_use_configuration,services)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,services)) - ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_CppunitTest_use_java_ure,services)) diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 6b6e3ea95c00..92d0ebf4c60e 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annotationobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index d986101075cc..1d95beff9fd3 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -100,6 +100,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationshapeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annotationshapeobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationshapeobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index 78760bf889e3..148cf182fed4 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_annotationsobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_annotationsobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_annotationsobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 76c45fe7f724..c5901150a3f3 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_cellrangeobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_cellrangeobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk index ce3a33d97586..003b7c71846b 100644 --- a/sc/CppunitTest_sc_chart_regression_test.mk +++ b/sc/CppunitTest_sc_chart_regression_test.mk @@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_chart_regression_test)) - $(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2)) # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk index 3f742b8309e1..0ee259ea9562 100644 --- a/sc/CppunitTest_sc_condformats.mk +++ b/sc/CppunitTest_sc_condformats.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_condformats,\ $(eval $(call gb_CppunitTest_use_configuration,sc_condformats)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_condformats)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index 160d3ef66b3f..90e3ece095c2 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -103,6 +103,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_databaserangeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_databaserangeobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_databaserangeobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 23f52ca59b6e..3c5cb55c0f84 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilotfieldobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilotfieldobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilotfieldobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 376732bb54c6..8a1f3aef6d5f 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_datapilottableobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_datapilottableobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_datapilottableobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index cce906ad4843..d1e8ce8246c6 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -102,6 +102,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_cell,\ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_cell)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_cell)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index 20c4b6c94b79..90fb12ea81fb 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -102,6 +102,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_editfieldobj_header,\ $(eval $(call gb_CppunitTest_use_configuration,sc_editfieldobj_header)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_editfieldobj_header)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_html_export_test.mk b/sc/CppunitTest_sc_html_export_test.mk index 21aa210caa5a..6a69a67e3ae1 100644 --- a/sc/CppunitTest_sc_html_export_test.mk +++ b/sc/CppunitTest_sc_html_export_test.mk @@ -111,6 +111,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_html_export_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_html_export_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_html_export_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 4794387c88a7..bb33f5ca7af6 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -114,6 +114,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_macros_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_macros_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index 2d31d9155c94..ece6f5a49d7d 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_modelobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_modelobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_modelobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index 40b4e7029c64..ba2f9b58d6eb 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangeobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangeobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangeobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 0ebc22a5ea25..cca0de7210c0 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -104,6 +104,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_namedrangesobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 48eed8bf0270..2356032d5d35 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_outlineobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_outlineobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_outlineobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk index decabe0966a8..285991af90b5 100644 --- a/sc/CppunitTest_sc_perfobj.mk +++ b/sc/CppunitTest_sc_perfobj.mk @@ -72,6 +72,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sc_perfobj,services)) $(eval $(call gb_CppunitTest_use_configuration,sc_perfobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_perfobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 24e885c5ec07..2bf6f0fd82eb 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -122,6 +122,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_rangelst_test,\ $(eval $(call gb_CppunitTest_use_configuration,sc_rangelst_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_rangelst_test)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_recordchanges.mk b/sc/CppunitTest_sc_recordchanges.mk index 58ec52f57c5f..225ac2c306bf 100644 --- a/sc/CppunitTest_sc_recordchanges.mk +++ b/sc/CppunitTest_sc_recordchanges.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_recordchanges,\ $(eval $(call gb_CppunitTest_use_configuration,sc_recordchanges)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_recordchanges)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk index 22e638149066..3769fe992d82 100644 --- a/sc/CppunitTest_sc_styleloaderobj.mk +++ b/sc/CppunitTest_sc_styleloaderobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_styleloaderobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_styleloaderobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_styleloaderobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 4a65b6ff3cdd..107012d10590 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetobj)) - # vim: set noet sw=4 ts=4: diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 4ce09f888324..a6506e417186 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -105,6 +105,4 @@ $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\ $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_tablesheetsobj)) - # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_export_tests.mk b/sd/CppunitTest_sd_export_tests.mk index 1c54b95f0c99..e1fdbc4e03ce 100644 --- a/sd/CppunitTest_sd_export_tests.mk +++ b/sd/CppunitTest_sd_export_tests.mk @@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sd_export_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_export_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_export_tests)) - $(eval $(call gb_CppunitTest_add_arguments,sd_export_tests,\ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) diff --git a/sd/CppunitTest_sd_html_export_tests.mk b/sd/CppunitTest_sd_html_export_tests.mk index 0feb03b63cc2..02908d8c7ac7 100644 --- a/sd/CppunitTest_sd_html_export_tests.mk +++ b/sd/CppunitTest_sd_html_export_tests.mk @@ -111,8 +111,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_html_export_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_html_export_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_html_export_tests)) - $(call gb_CppunitTest_get_target,sd_html_export_tests) : $(call gb_AllLangResTarget_get_target,sd) # vim: set noet sw=4 ts=4: diff --git a/sd/CppunitTest_sd_import_tests.mk b/sd/CppunitTest_sd_import_tests.mk index e0658500dbbc..8a84e4c556cf 100644 --- a/sd/CppunitTest_sd_import_tests.mk +++ b/sd/CppunitTest_sd_import_tests.mk @@ -108,8 +108,6 @@ $(eval $(call gb_CppunitTest_use_components,sd_import_tests,\ $(eval $(call gb_CppunitTest_use_configuration,sd_import_tests)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sd_import_tests)) - $(eval $(call gb_CppunitTest_add_arguments,sd_import_tests,\ "-env:SVG_DISABLE_FONT_EMBEDDING=YEAH" \ )) diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bc1aa067d670..f7c857713cbe 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -273,8 +273,8 @@ $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_ endef -# Use standard configuration. -define gb_CppunitTest_use_configuration +# Use instdir configuration +define gb_CppunitTest_use_instdir_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry) @@ -287,6 +287,13 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registr endef +# Use standard configuration: instdir config + unittest config (in this order!) +define gb_CppunitTest_use_configuration +$(call gb_CppunitTest_use_instdir_configuration,$(1)) +$(call gb_CppunitTest_use_unittest_configuration,$(1)) + +endef + define gb_CppunitTest_use_executable $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) diff --git a/sw/CppunitTest_sw_globalfilter.mk b/sw/CppunitTest_sw_globalfilter.mk index fd2001efadae..c6fa6ccd1168 100644 --- a/sw/CppunitTest_sw_globalfilter.mk +++ b/sw/CppunitTest_sw_globalfilter.mk @@ -91,6 +91,4 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sw_globalfilter,\ $(eval $(call gb_CppunitTest_use_configuration,sw_globalfilter)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_globalfilter)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk index 23cdef152076..6d8b9fd01e0d 100644 --- a/sw/CppunitTest_sw_htmlexport.mk +++ b/sw/CppunitTest_sw_htmlexport.mk @@ -89,6 +89,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_htmlexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlexport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index dd7d6e7f6b73..410c6baa9d26 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -54,6 +54,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_htmlimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_htmlimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_htmlimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index dd8af0c6fec4..91327db91e91 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -94,6 +94,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_layout_test)) -$(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 251597d0dd32..8792bc163c4b 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -107,6 +107,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_macros_test)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk index 97398af0a756..7bc7ed826a14 100644 --- a/sw/CppunitTest_sw_odfexport.mk +++ b/sw/CppunitTest_sw_odfexport.mk @@ -86,6 +86,4 @@ $(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 71223022d55a..eaa3542993d4 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -90,6 +90,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_odfimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk index 31a77f979224..ae67c2087438 100644 --- a/sw/CppunitTest_sw_ooxmlfieldexport.mk +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlfieldexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlfieldexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlfieldexport)) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlfieldexport,\ oox_generated \ )) diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 5d21e9eefcc4..6ee96e31b3d0 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -89,6 +89,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ooxmlsdrexport.mk b/sw/CppunitTest_sw_ooxmlsdrexport.mk index a5e25fcaad44..65e6ec3c87fd 100644 --- a/sw/CppunitTest_sw_ooxmlsdrexport.mk +++ b/sw/CppunitTest_sw_ooxmlsdrexport.mk @@ -48,8 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlsdrexport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlsdrexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlsdrexport)) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlsdrexport,\ oox_customshapes \ oox_generated \ diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index 10583ec53c86..5958019b8820 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlw14export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlw14export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlw14export)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index 48c87589d5ac..b47c9068a705 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_rtfexport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 049e1a13cc37..3eafcea38e58 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -81,6 +81,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\ $(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk index a34093b39d89..45112a47d5e8 100644 --- a/sw/CppunitTest_sw_uiwriter.mk +++ b/sw/CppunitTest_sw_uiwriter.mk @@ -59,6 +59,4 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_uiwriter,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_uiwriter)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_uiwriter)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 6a661028cad5..d7ea01189ef8 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -81,6 +81,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8export,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export)) - # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index b916cefeff20..63230e47021e 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -73,6 +73,4 @@ $(eval $(call gb_CppunitTest_use_components,sw_ww8import,\ $(eval $(call gb_CppunitTest_use_configuration,sw_ww8import)) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import)) - # vim: set noet sw=4 ts=4: diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 03f6bacac7cc..5eeccadd0c0a 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -101,8 +101,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport$(1),\ $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport$(1))) -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport$(1))) - $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport$(1),\ oox_customshapes \ oox_generated \ |