[Libreoffice-commits] core.git: pyuno/Module_pyuno.mk pyuno/PythonTest_pytests.mk

[Stephan Bergmann]

 pyuno/Module_pyuno.mk       |    5 +----
 pyuno/PythonTest_pytests.mk |   31 -------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

New commits:
commit 9444671f1e4a73037a3b5c4efa2a045a1a8f9245
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 26 18:30:05 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

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
 
diff --git a/pyuno/PythonTest_pytests.mk b/pyuno/PythonTest_pytests.mk
deleted file mode 100644
index 71255b638e5a..000000000000
--- a/pyuno/PythonTest_pytests.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# Dummy .mk to have a single "make PythonTest_pytests" goal to run all the
-# pyuno/PythonTest_pyuno_pytests_*.mk tests (which are not run by default).
-#
-# To add a new test pyuno/PythonTest_pyuno_pytests_NEW.mk, add
-#
-#   $(call gb_PythonTest_get_target,pyuno_pytests_NEW) \
-#
-# to the below list and
-#
-#   PythonTest_pyuno_pytests_NEW \
-#
-# to the list in the "ifneq (,$(filter PythonTest_pytests,$(MAKECMDGOALS)))"
-# section of pyuno/Module_pyuno.mk.
-
-$(eval $(call gb_PythonTest_PythonTest,pytests))
-
-$(call gb_PythonTest_get_target,pytests) : \
-    $(call gb_PythonTest_get_target,pyuno_pytests_testcollections) \
-    $(call gb_PythonTest_get_target,pyuno_pytests_insertremovecells) \
-    $(call gb_PythonTest_get_target,pyuno_pytests_ssl) \
-
-# vim: set noet sw=4 ts=4: