strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need for Android, iOS or CROSS_COMPILING conditionals for unit tests

Browse source 
We don't run unit tests when cross-compiling anyway and since
d4ea8c6b7e the corresponding .mk files
aren't even read by Make.

Change-Id: Icbee9ad51841d515a551e67708d9594358ce7e71
This commit is contained in:
Tor Lillqvist 2013-04-15 21:15:10 +03:00
parent ca3392e833
commit 0b2eae62f1
7 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
basebmp/CppunitTest_basebmp.mk
View file

@ -16,15 +16,9 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers))
ifeq ($(OS),ANDROID)
$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
basebmp \
))
else
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basebmp \
))
endif
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basegfx \

3
sal/CppunitTest_sal_rtl_strings.mk
View file

@ -48,10 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\
))
# The test uses O(U)String capabilities that dlopen this lib
ifneq ($(OS),ANDROID)
# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_strings) : \
$(call gb_Library_get_target,sal_textenc)
endif
# vim: set noet sw=4 ts=4:

3
sal/CppunitTest_sal_rtl_textenc.mk
View file

@ -20,10 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_textenc,\
))
# The test uses O(U)String capabilities that dlopen this lib
ifneq ($(OS),ANDROID)
# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_textenc) : \
$(call gb_Library_get_target,sal_textenc)
endif
# vim: set noet sw=4 ts=4:

4
sal/CppunitTest_sal_rtl_uri.mk
View file

@ -26,11 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\
))
# The test uses O(U)String capabilities that dlopen this lib
ifneq ($(OS),ANDROID)
# Except that on Android we don't build it separately
$(call gb_CppunitTest_get_target,sal_rtl_uri) : \
$(call gb_Library_get_target,sal_textenc)
endif
# vim: set noet sw=4 ts=4:

3
sc/CppunitTest_sc_filters_test.mk
View file

@ -76,9 +76,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
utl \
vcl \
xo \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
$(gb_UWINAPI) \
))

5
sc/CppunitTest_sc_subsequent_export_test.mk
View file

@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
utl \
vcl \
xo \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
$(gb_UWINAPI) \
))
@ -133,12 +130,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xsec_xmlsec.windows \
))
else
ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_export_test,\
xmlsecurity/util/xsec_xmlsec \
))
endif
endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_export_test))

5
sc/CppunitTest_sc_subsequent_filters_test.mk
View file

@ -70,9 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
utl \
vcl \
xo \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
$(gb_UWINAPI) \
))
@ -134,12 +131,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec.windows \
))
else
ifneq ($(filter-out IOS ANDROID,$(OS)),) #FIXME: get nss&xmlsec building
$(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
xmlsecurity/util/xsec_xmlsec \
))
endif
endif
$(eval $(call gb_CppunitTest_use_configuration,sc_subsequent_filters_test))