diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-12-19 13:59:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-12-19 14:00:13 +0100 |
| commit | 9351f4c1d6a3567c3b013894a0cc08471b4b0156 (patch) | |
| tree | f7fd1e14bd507b224ab138792fbdef3e0c5dc89a /sw | |
| parent | f039057048f850f9b43c297258342fb3bc869a6f (diff) | |
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.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 4 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 5 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 53a6c891cb88..34d6afba019e 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 606679140e61..58d11faaf68a 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 7a186f962aab..8cea3f7d514b 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: |