2 files changed, 11 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 0e0e39549..571ff3ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:7.4p1-3) UNRELEASED; urgency=medium
     it doesn't seem to help.
   * Run regression tests using 'sh -x' to try to get more information about
     failures.
+  * Dump some useful log files if regression tests fail.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 01:22:48 +0000
 
diff --git a/debian/tests/regress b/debian/tests/regress
index 37f9fe6a2..f3352e3d2 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -45,6 +45,7 @@ make regress-binaries
 
 SRCDIR="$(pwd)"
 BUILDDIR="$SRCDIR"
+ret=0
 make -C regress \
         .OBJDIR="$BUILDDIR/regress" \
         .CURDIR="$SRCDIR/regress" \
@@ -58,4 +59,12 @@ make -C regress \
         TEST_SSH_CONCH=conch \
         TEST_SSH_IPV6=yes \
         TEST_SSH_ECC=yes \
-        tests interop-tests </dev/zero
+        tests interop-tests </dev/zero || ret="$?"
+if [ "$ret" -ne 0 ]; then
+        for log in failed-regress.log failed-ssh.log failed-sshd.log; do
+                if [ -e "$BUILDDIR/regress/$log" ]; then
+                        tail -v -n+0 "$BUILDDIR/regress/$log"
+                fi
+        done
+fi
+exit "$ret"