[libreoffice] 01/03: the pytests are now in make check

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 4c4040a9ab0f8a603264078e04b7cda8f5d39324
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Sep 30 19:18:55 2017 +0200

    the pytests are now in make check
---
 changelog |  2 +-
 rules     | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/changelog b/changelog
index ead0445..f351300 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170924-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170930-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/rules b/rules
index 09772a7..952c413 100755
--- a/rules
+++ b/rules
@@ -294,15 +294,11 @@ ifeq "$(ENABLE_JAVA)" "y"
     else
       RUN_MAKE_CHECK=n
       ENABLE_JUNIT4=n
-      RUN_PYTESTS=n
       ENABLE_CHART_TESTS=n
       ENABLE_EXPORT_VALIDATION_TESTS=n
       BUILD_TEST_PACKAGE=n
     endif
   endif
-ifeq "$(ENABLE_PYTHON)" "y"
-  RUN_PYTESTS=y
-endif
 #  ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
 #    export DISABLE_CVE_TESTS=TRUE
 #  endif
@@ -317,19 +313,15 @@ endif
 #  endif
   ifneq (,$(findstring kfreebsd-amd64,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
-    export RUN_PYTESTS=n
   endif
   ifneq (,$(findstring kfreebsd-i386,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
-    export RUN_PYTESTS=n
   endif
   ifneq (,$(findstring sparc64,$(DEB_HOST_ARCH)))
     export RUN_MAKE_CHECK=n
-    export RUN_PYTESTS=n
   endif
 else
   RUN_MAKE_CHECK=n
-  RUN_PYTESTS=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -337,7 +329,6 @@ else
 endif
 else
   RUN_MAKE_CHECK=n
-  RUN_PYTESTS=n
   ENABLE_JUNIT4=n
   ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -2062,11 +2053,6 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
 endif
 endif
 
-ifeq "$(RUN_PYTESTS)" "y"
-	$(IGNORE_MAKE_CHECK_FAILURES)cd $(SOURCE_TREE)/pyuno && \
-		$(MAKE) PythonTest_pytests
-endif
-
 check-indep:
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   ifeq "$(ENABLE_JAVA)" "y"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git