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

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:

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)
 

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:

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)

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 $@)

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 $@)

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:

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 $@)

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:

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)
 

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)
 

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 $@)

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))
 

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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" \
 ))

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:

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" \
 ))

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))
 

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:

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:

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:

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:

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:

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:

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:

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 \
 ))

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:

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 \

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:

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:

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:

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:

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:

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:

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 \