diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:05:54 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:33:07 +0100 |
commit | f0a60415597bae7ca54767b397a217882578ce97 (patch) | |
tree | 353c68981f745ba4be44042b64934b063f220bf2 /sc | |
parent | 5f444791fbae38ad69a0497a074e2411da8cbb0f (diff) |
gbuild: CppunitTest: always use unittest configuration
The sc_subsequent_filters_test was failing because of a lock file
because it did not use the unittest configuration.
Refactor gb_CppunitTest_use_configuration so it uses both the instdir
and unittest configuration to prevent such errors.
In case there ever is a test that does not work with the unittest
configuration it should call gb_CppunitTest_use_instdir_configuration.
Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e
Diffstat (limited to 'sc')
23 files changed, 0 insertions, 46 deletions
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: |