[Libreoffice-commits] .: sc/CppunitTest_sc_cellrangesbase.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_ucalc.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_swdoc_test.mk
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Dec 19 05:01:50 PST 2011
sc/CppunitTest_sc_cellrangesbase.mk | 5 ++++-
sc/CppunitTest_sc_datapilotfieldobj.mk | 5 ++++-
sc/CppunitTest_sc_filters_test.mk | 5 ++++-
sc/CppunitTest_sc_macros_test.mk | 5 ++++-
sc/CppunitTest_sc_namedrangeobj.mk | 5 ++++-
sc/CppunitTest_sc_subsequent_filters_test.mk | 5 ++++-
sc/CppunitTest_sc_tableautoformatfield.mk | 5 ++++-
sc/CppunitTest_sc_ucalc.mk | 10 ++++++----
sw/CppunitTest_sw_filters_test.mk | 4 +++-
sw/CppunitTest_sw_macros_test.mk | 5 +++--
sw/CppunitTest_sw_swdoc_test.mk | 8 ++++----
11 files changed, 44 insertions(+), 18 deletions(-)
New commits:
commit 9351f4c1d6a3567c3b013894a0cc08471b4b0156
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Dec 19 13:59:10 2011 +0100
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.
diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk
index 07822e5..051ee27 100644
--- a/sc/CppunitTest_sc_cellrangesbase.mk
+++ b/sc/CppunitTest_sc_cellrangesbase.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 74cfeb3..236ffb9 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 034debd..c6b69f1 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 3252d15..e760cb2 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index cb01294..c41c29e 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 6a97f93..2fe33e9 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 426cf93..1a65fa6 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -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
# relation
# 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:
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 8fc3d1d..3862ff2 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -37,10 +37,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
$(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): $(WORKDIR)/AllLangRes/frm
-$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/for
-$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): $(WORKDIR)/AllLangRes/forui
+$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
+ $(WORKDIR)/AllLangRes/for \
+ $(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, \
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 53a6c89..34d6afb 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -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
# 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:
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 6066791..58d11fa 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -138,7 +138,8 @@ $(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
# relation
# b) explicitly depend on the sw resource files needed at unit-test runtime
$(call gb_CppunitTest_get_target,sw_macros_test) : \
- $(call gb_Library_get_target,msword) \
- $(call gb_Library_get_target,vbaswobj) \
+ $(call gb_Library_get_target,localedata_en) \
+ $(call gb_Library_get_target,msword) \
+ $(call gb_Library_get_target,vbaswobj) \
# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 7a186f9..8cea3f7 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -108,9 +108,6 @@ $(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\
ucpfile1 \
))
-$(call gb_CppunitTest_get_target,sw_swdoc_test) : \
- $(call gb_AllLangResTarget_get_target,sw)
-
$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
@@ -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
# 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:
More information about the Libreoffice-commits
mailing list