summaryrefslogtreecommitdiff
path: root/debian/tests
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-01-01 14:38:21 +0000
committerColin Watson <cjwatson@debian.org>2017-01-01 15:05:15 +0000
commitfb685a2e51057d965305da7ce2f0234e5c3a1017 (patch)
tree657afff2d09d12dadaa09c7396507b6b8f209a1b /debian/tests
parentc3e0f29d16ee400a73ee05efb22a139c4b415ada (diff)
Run regression tests inside annotate-output to try to diagnose timeout issues.
Diffstat (limited to 'debian/tests')
-rw-r--r--debian/tests/control3
-rwxr-xr-xdebian/tests/regress2
2 files changed, 3 insertions, 2 deletions
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" \