diff options
| -rw-r--r-- | solenv/gbuild/PythonTest.mk | 56 | ||||
| -rw-r--r-- | sw/PythonTest_sw_python.mk | 39 |
2 files changed, 1 insertions, 94 deletions
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index ac95b29fac9b..46803af5b7c8 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -53,61 +53,12 @@ $(call gb_PythonTest_get_target,%) : define gb_PythonTest_PythonTest $(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python:$(gb_DEVINSTALLROOT)/program $(call gb_PythonTest_get_target,$(1)) : MODULES := -$(call gb_PythonTest_get_target,$(1)) : CONFIGURATION_LAYERS := -$(call gb_PythonTest_get_target,$(1)) : UNO_TYPES := -$(call gb_PythonTest_get_target,$(1)) : UNO_SERVICES := - -$(call gb_PythonTest_use_api,$(1),udkapi) -$(call gb_PythonTest_use_rdb,$(1),ure/services) $(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest) endef -define gb_PythonTest_use_configuration -$(call gb_PythonTest_get_target,$(1)) : \ - $(call gb_Configuration_get_target,registry) \ - $(call gb_Configuration_get_target,fcfg_langpack) \ - $(call gb_Package_get_target,test_unittest) -$(call gb_PythonTest_get_target,$(1)) : CONFIGURATION_LAYERS += \ - xcsxcu:$(call gb_Helper_make_url,$(gb_Configuration_registry)) \ - module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool) \ - xcsxcu:$(call gb_Helper_make_url,$(OUTDIR)/unittest/registry) - -endef - -define gb_PythonTest__use_api -$(call gb_PythonTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2)) -$(call gb_PythonTest_get_target,$(1)) : \ - UNO_TYPES += $(call gb_UnoApi_get_target,$(2)) - -endef - -define gb_PythonTest_use_api -$(foreach api,$(2),$(call gb_PythonTest__use_api,$(1),$(api))) -endef - -define gb_PythonTest_use_rdb -$(call gb_PythonTest_get_target,$(1)) : $(call gb_Rdb_get_outdir_target,$(2)) -$(call gb_PythonTest_get_target,$(1)) : \ - UNO_SERVICES += $(call gb_Rdb_get_outdir_target,$(2)) - -endef - -define gb_PythonTest_use_component -$(call gb_PythonTest_get_target,$(1)) : \ - $(call gb_ComponentTarget_get_outdir_target,$(2)) -$(call gb_PythonTest_get_target,$(1)) : \ - UNO_SERVICES += $(call gb_ComponentTarget_get_outdir_target,$(2)) - -endef - -define gb_PythonTest_use_components -$(foreach component,$(call gb_CppunitTest__filter_not_built_components,$(2)),$(call gb_PythonTest_use_component,$(1),$(component))) - -endef - # put the directory on the PYTHONPATH because the "unittest" loader # mysteriously fails to load modules given as absolute path unless the $PWD is # a prefix of the absolute path, which it is not when we go into a certain @@ -139,12 +90,7 @@ $(call gb_Helper_make_userfriendly_targets,$(1),PythonTest) endef -gb_PythonTest_use_configuration := -gb_PythonTest_use_api := -gb_PythonTest_use_rdb := -gb_PythonTest_use_components := -gb_PythonTest_add_classes := -gb_PythonTest_add_class := +gb_PythonTest_add_modules := gb_PythonTest_use_customtarget := endif # DISABLE_PYTHON diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk index 09a48a964d6c..a5a632c2ef52 100644 --- a/sw/PythonTest_sw_python.mk +++ b/sw/PythonTest_sw_python.mk @@ -9,45 +9,6 @@ $(eval $(call gb_PythonTest_PythonTest,sw_python)) -$(eval $(call gb_PythonTest_use_configuration,sw_python)) - -$(eval $(call gb_PythonTest_use_api,sw_python,offapi)) - -# FAIL: this brings in GconfBackend $(eval $(call gb_PythonTest_use_rdb,sw_python,services)) - -$(eval $(call gb_PythonTest_use_components,sw_python,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - fileaccess/source/fileacc \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sax/source/fastparser/fastsax \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sw/util/vbaswobj \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - ucb/source/ucp/tdoc/ucptdoc1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ -)) - $(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\ set_expression \ get_expression \ |