[libreoffice] 03/04: git update; --without-export-validation for now
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 607e2dbfb64c3c096697138012671ebc74f91874
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 18 18:48:10 2016 +0200
git update; --without-export-validation for now
---
changelog | 2 +-
rules | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index e93caf6..a8c36d9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160817-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20160818-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
diff --git a/rules b/rules
index 25e2428..ecf3e34 100755
--- a/rules
+++ b/rules
@@ -275,7 +275,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(DEB_HOST_ARCH)" "amd64"
ENABLE_JUNIT4=y
endif
- RUN_PYTESTS=y
+ ENABLE_EXPORT_VALIDATION_TESTS=n
endif
else
ifeq "$(JDK)" "openjdk"
@@ -286,14 +286,16 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(DEB_HOST_ARCH)" "amd64"
ENABLE_JUNIT4=y
endif
- RUN_PYTESTS=y
+ ENABLE_EXPORT_VALIDATION_TESTS=n
else
RUN_MAKE_CHECK=n
ENABLE_JUNIT4=n
RUN_PYTESTS=n
+ ENABLE_EXPORT_VALIDATION_TESTS=n
BUILD_TEST_PACKAGE=n
endif
endif
+ RUN_PYTESTS=y
# ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
# export DISABLE_CVE_TESTS=TRUE
# endif
@@ -318,6 +320,7 @@ ifeq "$(ENABLE_JAVA)" "y"
else
RUN_MAKE_CHECK=n
ENABLE_JUNIT4=n
+ ENABLE_EXPORT_VALIDATION_TESTS=n
BUILD_TEST_PACKAGE=n
endif
ifeq "$(ENABLE_JUNIT4)" "y"
@@ -910,7 +913,11 @@ endif
else
CONFIGURE_FLAGS += --without-junit
endif
-
+ ifeq "$(ENABLE_EXPORT_VALIDATION_TESTS)" "y"
+ # FIXME
+ else
+ CONFIGURE_FLAGS += --without-export-validation
+ endif
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifeq (lang=,$(findstring lang=,$(DEB_BUILD_OPTIONS)))
ISOS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^.*lang=\([^\s].*\)\s.*/\1/p' | awk '{ print $$1 }' | sed -e 's/,/ /g')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: