[libreoffice] 01/01: use allow-stderr instead of manual 2>&1

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 6404d6841793c1b1933b79aa8783c271124289a3
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jul 13 23:11:14 2017 +0200

    use allow-stderr instead of manual 2>&1
---
 changelog                   | 7 +++++++
 tests/control               | 2 ++
 tests/junit-subsequentcheck | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 7330539..07884fc 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.3.4-4) UNRELEASED; urgency=medium
+
+  * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
+    instead of manual 2>&1
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 13 Jul 2017 23:06:04 +0200
+
 libreoffice (1:5.3.4-3) unstable; urgency=medium
 
   * reupload with proper control.
diff --git a/tests/control b/tests/control
index 17030d4..aa2682b 100644
--- a/tests/control
+++ b/tests/control
@@ -3,6 +3,8 @@ Depends: python3, python3-uno
 
 Tests: junit-subsequentcheck
 Depends: @builddeps@, libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb
+Restrictions: allow-stderr
 
 Tests: sdk-examples
 Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean, zip
+Restrictions: allow-stderr
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
index a0ec91d..9de1928 100755
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@ -17,12 +17,12 @@ patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
 echo
 echo "====== Generating configuration ======="
 rm -f config_host.mk
-./debian/rules config_host.mk enable_report_builder=no 2>&1
+./debian/rules config_host.mk enable_report_builder=no
 sed -i 's/export OOO_JUNIT_JAR=.*/export OOO_JUNIT_JAR=\/usr\/share\/java\/junit4.jar/' config_host.mk
 
 echo
 echo "====== Cleaning tree ======"
-make clean 2>&1
+make clean
 
 OOO_TEST_SOFFICE="${1:-path:/usr/lib/libreoffice/program/soffice}"
 
@@ -37,4 +37,4 @@ echo "====== Starting subsequentcheck with ${CHECK_PARALLELISM} job against ${OO
 make -rk \
     OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
     bridges_SELECTED_BRIDGE=foo \
-    subsequentcheck verbose=t 2>&1
+    subsequentcheck verbose=t

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