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

Drop needless junit and python make conditionals

Browse source 
JunitTest and PythonTest modules check for these themself.

Change-Id: Ia453bc99571738b01cc8f161f346cb6c37b2e429
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88832
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2020-02-16 21:00:57 +01:00 committed by Jan-Marek Glogowski
parent f55140c737
commit e81414d39b
9 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dbaccess/Module_dbaccess.mk
View file

@ -83,13 +83,11 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_unoapi \
))
ifneq ($(DISABLE_PYTHON),TRUE)
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
PythonTest_dbaccess_python \
))
endif
endif
# screenshots
$(eval $(call gb_Module_add_screenshot_targets,dbaccess,\

2
framework/Module_framework.mk
View file

@ -37,11 +37,9 @@ $(eval $(call gb_Module_add_l10n_targets,framework,\
AllLangMoTarget_fwk \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\
JunitTest_framework_complex \
JunitTest_framework_unoapi \
))
endif
# vim: set noet sw=4 ts=4:

2
sc/Module_sc.mk
View file

@ -217,11 +217,9 @@ $(eval $(call gb_Module_add_perfcheck_targets,sc,\
CppunitTest_sc_tablesheetobj \
))
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
PythonTest_sc_python \
))
endif
# screenshots
$(eval $(call gb_Module_add_screenshot_targets,sc,\

4
sfx2/Module_sfx2.mk
View file

@ -38,18 +38,14 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\
CppunitTest_sfx2_classification \
))
ifneq ($(ENABLE_JAVA),)
$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
JunitTest_sfx2_complex \
JunitTest_sfx2_unoapi \
))
endif
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
PythonTest_sfx2_python \
))
endif
#todo: clean up quickstarter stuff in both libraries
#todo: move standard pool to svl

2
svl/Module_svl.mk
View file

@ -40,11 +40,9 @@ $(eval $(call gb_Module_add_check_targets,svl,\
CppunitTest_svl_urihelper \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svl,\
JunitTest_svl_complex \
))
endif
#todo: dde platform dependent
#todo: package_inc

2
svtools/Module_svtools.mk
View file

@ -43,11 +43,9 @@ endif
endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\
JunitTest_svtools_unoapi \
))
endif
# screenshots
$(eval $(call gb_Module_add_screenshot_targets,svtools,\

2
svx/Module_svx.mk
View file

@ -47,11 +47,9 @@ $(eval $(call gb_Module_add_targets,svx,\
))
endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
JunitTest_svx_unoapi \
))
endif
#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?

4
sw/Module_sw.mk
View file

@ -126,7 +126,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
))
endif
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_complex \
JunitTest_sw_unoapi_1 \
@ -134,13 +133,10 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_unoapi_3 \
JunitTest_sw_unoapi_4 \
))
endif
ifneq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
PythonTest_sw_python \
))
endif
# screenshots
$(eval $(call gb_Module_add_screenshot_targets,sw,\

2
unoxml/Module_unoxml.mk
View file

@ -28,11 +28,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,unoxml,\
CppunitTest_unoxml_domtest \
))
ifneq ($(OOO_JUNIT_JAR),)
$(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
JunitTest_unoxml_complex \
JunitTest_unordf_complex \
))
endif
# vim: set noet sw=4 ts=4: