[libreoffice] 05/05: unapply the patch after the test/on error so the next test can patch again...

[Rene Engelhard]

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 be5ed2054c64f1686c304456fecad5d8b8f7f9ef
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 3 23:40:58 2017 +0200

    unapply the patch after the test/on error so the next test can patch again...
---
 changelog                   |  2 ++
 tests/junit-subsequentcheck | 15 +++++++++++++--
 tests/odk-build-examples    | 13 ++++++++++++-
 tests/uicheck               | 12 +++++++++++-
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 36b8385..f272604 100644
--- a/changelog
+++ b/changelog
@@ -20,6 +20,8 @@ libreoffice (1:5.4.0~rc2~git20170703-1) UNRELEASED; urgency=medium
     pyuno-import test import pyuno while uno-import does import uno
     (the uichecks do the former). add python3 Depends: for safety
   * debian/test/control: resort by importance
+  * debian/tests/: unapply patch after the make (or on error) so that the
+    next test can patch it...
 
   * debian/rules:
     - be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
index b30d4d8..9434f9f 100755
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@ -1,16 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 # autopkgtest check: Run junit base tests against an installed version of LibreOffice
 # (C) 2013 Canonical Ltd.
-# (c) 2015 Software in the Public Interest, Inc.
+# (c) 2015-2017 Software in the Public Interest, Inc.
 # Authors: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
 #          Rene Engelhard <rene at debian.org>
 
 set -e
+set -E
 
 SRCDIR=`pwd`
 WORKDIR=`mktemp -d`
 CHECK_PARALLELISM=1
 
+function unapply() {
+	echo "====== Unapplying the patch ======"
+	patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
+}
+
+trap "unapply" ERR
+
 echo "====== Patching the tree to only build Java-based unittests against an existing installation ======"
 patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
 
@@ -39,3 +47,6 @@ make -rk \
     OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
     bridges_SELECTED_BRIDGE=foo \
     subsequentcheck verbose=t 2>&1
+
+unapply
+
diff --git a/tests/odk-build-examples b/tests/odk-build-examples
index e6dabe1..4a17875 100755
--- a/tests/odk-build-examples
+++ b/tests/odk-build-examples
@@ -1,14 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 # autopkgtest check: Run the odk/build-examples check against an installed
 # version of the LibreOffice SDK
 # (c) 2017 Software in the Public Interest, Inc.
 # Authors: Rene Engelhard <rene at debian.org>
 
 set -e
+set -E
 
 SRCDIR=`pwd`
 CHECK_PARALLELISM=1
 
+function unapply() {
+	cd $SRCDIR
+	echo "====== Unapplying the patch ======"
+	patch -p1 -R < ./debian/tests/patches/odk-build-examples-standalone.diff
+}
+
+trap "unapply" ERR
 
 echo "====== Patching the tree to build the odk build-examples test against an existing installation ======"
 patch -p1 < ./debian/tests/patches/odk-build-examples-standalone.diff
@@ -25,3 +33,6 @@ cd $SRCDIR/odk
 export PARALLELISM=$CHECK_PARALLELISM
 make -rk \
 	make CustomTarget_odk/build-examples verbose=t 2>&1
+
+unapply
+
diff --git a/tests/uicheck b/tests/uicheck
index bb63f37..ada7c9f 100755
--- a/tests/uicheck
+++ b/tests/uicheck
@@ -1,14 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 # autopkgtest check: Run uicheck against an installed version of LibreOffice
 # (c) 2017 Software in the Public Interest, Inc.
 # Authors: Rene Engelhard <rene at debian.org>
 
 set -e
+set -E
 
 SRCDIR=`pwd`
 WORKDIR=`mktemp -d`
 CHECK_PARALLELISM=1
 
+function unapply() {
+	echo "====== Unapplying the patch ======"
+	patch -p1 -R < ./debian/tests/patches/uicheck-standalone.diff
+}
+
+trap "unapply" ERR
 
 echo "====== Patching the tree to build uicheck against an existing installation ======"
 patch -p1 < ./debian/tests/patches/uicheck-standalone.diff
@@ -48,3 +55,6 @@ export LC_ALL=en_US.UTF-8
 make -rk \
     OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
     uicheck verbose=t 2>&1
+
+unapply
+

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