[libreoffice] 102/152: disable cups for autopkgtests too

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 28031ef15ac104122180669727c9420bcd51c147
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Aug 25 10:53:01 2016 +0200

    disable cups for autopkgtests too
---
 changelog                   | 3 ++-
 tests/junit-subsequentcheck | 1 +
 tests/sdk-examples          | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 70a3947..0e61180 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:5.2.1~rc2-0ubuntu1) yakkety; urgency=medium
 
   * new upstream rc
+  * disable cups for autopkgtests too
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 25 Aug 2016 10:49:13 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 25 Aug 2016 10:51:54 +0200
 
 libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
 
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
index a0ec91d..9750d14 100755
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@ -37,4 +37,5 @@ echo "====== Starting subsequentcheck with ${CHECK_PARALLELISM} job against ${OO
 make -rk \
     OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
     bridges_SELECTED_BRIDGE=foo \
+    SAL_DISABLE_CUPS=true \
     subsequentcheck verbose=t 2>&1
diff --git a/tests/sdk-examples b/tests/sdk-examples
index abae535..3157a0d 100755
--- a/tests/sdk-examples
+++ b/tests/sdk-examples
@@ -10,6 +10,7 @@ SRCDIR=`pwd`
 _old_sdk_out=$OO_SDK_OUT
 WORKDIR=`mktemp -d`
 export OO_SDK_OUT=$WORKDIR
+export SAL_DISABLE_CUPS="true"
 export PATH=`echo $PATH | sed -e "s,$_old_sdk_out,$OO_SDK_OUT,g"`
 
 echo "====== Building C++ example DocumentLoader ====== "

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