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

8 files changed, 0 insertions, 16 deletions

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