Kaydet (Commit) 9351f4c1 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Tests apparently depend on localedata_en library.

More tests might be affected.  Also unclear to me whether it is always (only)
localedata_en, or whether it could also be _es/_euro/_others.
üst f0390570
...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\ ...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_cellrangesbase) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_cellrangesbase) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\ ...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_datapilotfieldobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -133,6 +133,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\ ...@@ -133,6 +133,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_filters_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_filters_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -135,6 +135,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\ ...@@ -135,6 +135,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_macros_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_macros_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\ ...@@ -137,6 +137,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_namedrangeobj) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_namedrangeobj) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -147,6 +147,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\ ...@@ -147,6 +147,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_subsequent_filters_test) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -136,6 +136,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\ ...@@ -136,6 +136,9 @@ $(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
# a) explicitly depend on library msword because it is not implied by a link # a) explicitly depend on library msword because it is not implied by a link
# relation # relation
# b) explicitly depend on the sc resource files needed at unit-test runtime # b) explicitly depend on the sc resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sc_tableautoformatfield) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc $(call gb_CppunitTest_get_target,sc_tableautoformatfield) : \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,scfilt) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -37,10 +37,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ ...@@ -37,10 +37,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc)) $(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/sc $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/frm $(WORKDIR)/AllLangRes/for \
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/for $(WORKDIR)/AllLangRes/forui \
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/forui $(WORKDIR)/AllLangRes/frm \
$(WORKDIR)/AllLangRes/sc \
$(call gb_Library_get_target,localedata_en) \
$(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \ $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
......
...@@ -108,6 +108,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\ ...@@ -108,6 +108,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
# we need to explicitly depend on library msword because it is not implied # we need to explicitly depend on library msword because it is not implied
# by a link relation # by a link relation
$(call gb_CppunitTest_get_target,sw_filters_test) : $(call gb_Library_get_target,msword) $(call gb_CppunitTest_get_target,sw_filters_test) : \
$(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,msword) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -138,7 +138,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\ ...@@ -138,7 +138,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
# relation # relation
# b) explicitly depend on the sw resource files needed at unit-test runtime # b) explicitly depend on the sw resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sw_macros_test) : \ $(call gb_CppunitTest_get_target,sw_macros_test) : \
$(call gb_Library_get_target,msword) \ $(call gb_Library_get_target,localedata_en) \
$(call gb_Library_get_target,vbaswobj) \ $(call gb_Library_get_target,msword) \
$(call gb_Library_get_target,vbaswobj) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -108,9 +108,6 @@ $(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\ ...@@ -108,9 +108,6 @@ $(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\
ucpfile1 \ ucpfile1 \
)) ))
$(call gb_CppunitTest_get_target,sw_swdoc_test) : \
$(call gb_AllLangResTarget_get_target,sw)
$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\ $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
--headless \ --headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
...@@ -119,6 +116,9 @@ $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\ ...@@ -119,6 +116,9 @@ $(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
# we need to explicitly depend on the sw resource files needed at unit-test # we need to explicitly depend on the sw resource files needed at unit-test
# runtime # runtime
$(call gb_CppunitTest_get_target,sw_swdoc_test) : $(WORKDIR)/AllLangRes/sw $(call gb_CppunitTest_get_target,sw_swdoc_test) : \
$(WORKDIR)/AllLangRes/sw \
$(call gb_AllLangResTarget_get_target,sw) \
$(call gb_Library_get_target,localedata_en) \
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment