gbuild: missing dep on $(OUTDIR)/unittest/registry for tests

Change-Id: Ic80f57946e7b3f9c1bd99ed65955cf3c280063d2

14 files changed, 14 insertions, 42 deletions

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