summaryrefslogtreecommitdiff
path: root/pyuno/Module_pyuno.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-09-26 18:30:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-09-27 07:51:29 +0200
commit9444671f1e4a73037a3b5c4efa2a045a1a8f9245 (patch)
treec4e36a9228297150c893170cc88517eefa72652b /pyuno/Module_pyuno.mk
parentd21212cadebad682e7e3cce2b93b7d9a6ee1e1ec (diff)
Make these tests part of the regular 'make check'
...instead of the 'make PythonTest_pytests' hack introduced with 4e887567c5b4b06646ab1340376e240d6c5af9cb "A rudimentary framework for additional Python tests not run by default". PythonTest_pyuno_pytests_insertremovecells and PythonTest_pyuno_pytests_testcollections apparently have various dependencies that are not spelled out, so simply add them to subsequentcheck for now (also, the latter appears to take quite some time to execute). Change-Id: Ie9d3c301af28f67ab65c09eba93d9778a3c82c8a Reviewed-on: https://gerrit.libreoffice.org/42822 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'pyuno/Module_pyuno.mk')
-rw-r--r--pyuno/Module_pyuno.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index fb38a50119da..af19b16aceca 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -52,13 +52,10 @@ $(eval $(call gb_Module_add_check_targets,pyuno, \
))
endif
-ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS)))
-$(eval $(call gb_Module_add_targets,pyuno, \
- PythonTest_pytests \
+$(eval $(call gb_Module_add_subsequentcheck_targets,pyuno, \
PythonTest_pyuno_pytests_testcollections \
PythonTest_pyuno_pytests_insertremovecells \
))
-endif
endif # DISABLE_PYTHON