[libreoffice] 02/03: optionally add --enable-chart-tests (unused, as flaky/broken per configure.ac)

Rene Engelhard rene at moszumanska.debian.org
Sat Jun 3 15:21:31 UTC 2017


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

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

commit d375ead72e7304ca9d5c6e955ca4c80d28319999
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jun 3 15:57:36 2017 +0200

    optionally add --enable-chart-tests (unused, as flaky/broken per configure.ac)
---
 rules | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rules b/rules
index a26e8cd..5d6ba96 100755
--- a/rules
+++ b/rules
@@ -271,6 +271,7 @@ ifeq "$(ENABLE_JAVA)" "y"
         ifeq "$(DEB_HOST_ARCH)" "amd64"
 	  ENABLE_JUNIT4=y
         endif
+        ENABLE_CHART_TESTS=n
         ENABLE_EXPORT_VALIDATION_TESTS=n
     endif
   else
@@ -283,12 +284,14 @@ ifeq "$(ENABLE_JAVA)" "y"
         ifeq "$(DEB_HOST_ARCH)" "amd64"
 	  ENABLE_JUNIT4=y
         endif
+        ENABLE_CHART_TESTS=n
         ENABLE_EXPORT_VALIDATION_TESTS=n
     else
       RUN_MAKE_CHECK=n
       RUN_MAKE_UICHECK=n
       ENABLE_JUNIT4=n
       RUN_PYTESTS=n
+      ENABLE_CHART_TESTS=n
       ENABLE_EXPORT_VALIDATION_TESTS=n
       BUILD_TEST_PACKAGE=n
     endif
@@ -319,6 +322,7 @@ else
   RUN_MAKE_CHECK=n
   RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
+  ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
   BUILD_TEST_PACKAGE=n
 endif
@@ -326,6 +330,7 @@ else
   RUN_MAKE_CHECK=n
   RUN_MAKE_UICHECK=n
   ENABLE_JUNIT4=n
+  ENABLE_CHART_TESTS=n
   ENABLE_EXPORT_VALIDATION_TESTS=n
   BUILD_TEST_PACKAGE=n
 endif
@@ -946,6 +951,9 @@ endif
   else
 	CONFIGURE_FLAGS += --without-junit
   endif
+  ifeq "$(ENABLE_CHART_TESTS)" "y"
+	CONFIGURE_FLAGS += --enable-chart-tests
+  endif
   ifeq "$(ENABLE_EXPORT_VALIDATION_TESTS)" "y"
 	BUILD_DEPS += , libofficeotron-java$(OOO_NO_CHECK_ARCHS) <!nocheck>, libodfvalidator-java$(OOO_NO_CHECK_ARCHS) <!nocheck>
   else

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



More information about the Pkg-openoffice-commits mailing list