summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/tests/control3
-rwxr-xr-xdebian/tests/regress2
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index fd238ee51..246811ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:7.4p1-4) UNRELEASED; urgency=medium
2
3 * Run regression tests inside annotate-output to try to diagnose timeout
4 issues.
5
6 -- Colin Watson <cjwatson@debian.org> Sun, 01 Jan 2017 14:32:26 +0000
7
1openssh (1:7.4p1-3) unstable; urgency=medium 8openssh (1:7.4p1-3) unstable; urgency=medium
2 9
3 * Revert attempted hack around regress/forwarding.sh test failure, since 10 * Revert attempted hack around regress/forwarding.sh test failure, since
diff --git a/debian/tests/control b/debian/tests/control
index 62264efd5..df8f9b847 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
1Tests: regress 1Tests: regress
2Restrictions: needs-root allow-stderr 2Restrictions: needs-root allow-stderr
3Depends: openssh-client, 3Depends: devscripts,
4 openssh-client,
4 openssh-server, 5 openssh-server,
5 openssh-sftp-server, 6 openssh-sftp-server,
6 openssl, 7 openssl,
diff --git a/debian/tests/regress b/debian/tests/regress
index 1576da97b..662526b54 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -46,7 +46,7 @@ make regress-binaries
46SRCDIR="$(pwd)" 46SRCDIR="$(pwd)"
47BUILDDIR="$SRCDIR" 47BUILDDIR="$SRCDIR"
48ret=0 48ret=0
49make -C regress \ 49annotate-output +%H:%M:%S.%N make -C regress \
50 .OBJDIR="$BUILDDIR/regress" \ 50 .OBJDIR="$BUILDDIR/regress" \
51 .CURDIR="$SRCDIR/regress" \ 51 .CURDIR="$SRCDIR/regress" \
52 BUILDDIR="$BUILDDIR" \ 52 BUILDDIR="$BUILDDIR" \