diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-08-25 08:53:01 (GMT) |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-08-25 08:53:01 (GMT) |
| commit | 28031ef15ac104122180669727c9420bcd51c147 (patch) | |
| tree | 8c862cf18b4709679d90e84604d35e9c2fb76b7f | |
| parent | d1e343238232655a55555efce614a29a7790fc72 (diff) | |
disable cups for autopkgtests too
| -rw-r--r-- | changelog | 3 | ||||
| -rwxr-xr-x | tests/junit-subsequentcheck | 1 | ||||
| -rwxr-xr-x | tests/sdk-examples | 1 |
3 files changed, 4 insertions, 1 deletions
@@ -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@canonical.com> Thu, 25 Aug 2016 10:49:13 +0200 + -- Bjoern Michaelsen <bjoern.michaelsen@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 ====== " |