summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rwxr-xr-xdebian/run-tests2
-rw-r--r--debian/tests/control2
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 432b40358..a6f1662d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:8.0p1-4) UNRELEASED; urgency=medium
5 - Remove #! lines. 5 - Remove #! lines.
6 - Avoid star imports. 6 - Avoid star imports.
7 - Fix flake8 errors. 7 - Fix flake8 errors.
8 * Run regression tests against the Python 3 version of Twisted Conch.
8 9
9 -- Colin Watson <cjwatson@debian.org> Sat, 03 Aug 2019 12:49:17 +0100 10 -- Colin Watson <cjwatson@debian.org> Sat, 03 Aug 2019 12:49:17 +0100
10 11
diff --git a/debian/control b/debian/control
index b09575308..c690df075 100644
--- a/debian/control
+++ b/debian/control
@@ -163,7 +163,7 @@ Depends: openssh-client (= ${binary:Version}),
163 openssh-sftp-server (= ${binary:Version}), 163 openssh-sftp-server (= ${binary:Version}),
164 openssl, 164 openssl,
165 putty-tools (>= 0.67-2), 165 putty-tools (>= 0.67-2),
166 python-twisted-conch (>= 1:15.5.0-1), 166 python3-twisted,
167 ${misc:Depends}, 167 ${misc:Depends},
168 ${shlibs:Depends}, 168 ${shlibs:Depends},
169Description: OpenSSH regression tests 169Description: OpenSSH regression tests
diff --git a/debian/run-tests b/debian/run-tests
index 7c7a8b2a3..2b787ef60 100755
--- a/debian/run-tests
+++ b/debian/run-tests
@@ -25,7 +25,7 @@ make -C "$tmp/regress" \
25 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \ 25 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
26 TEST_SSH_PLINK=plink \ 26 TEST_SSH_PLINK=plink \
27 TEST_SSH_PUTTYGEN=puttygen \ 27 TEST_SSH_PUTTYGEN=puttygen \
28 TEST_SSH_CONCH=conch \ 28 TEST_SSH_CONCH=conch3 \
29 TEST_SSH_IPV6=yes \ 29 TEST_SSH_IPV6=yes \
30 TEST_SSH_ECC=yes \ 30 TEST_SSH_ECC=yes \
31 tests interop-tests </dev/zero || ret="$?" 31 tests interop-tests </dev/zero || ret="$?"
diff --git a/debian/tests/control b/debian/tests/control
index b010ac63c..8bc480a74 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -5,6 +5,6 @@ Depends: devscripts,
5 openssh-tests, 5 openssh-tests,
6 openssl, 6 openssl,
7 putty-tools, 7 putty-tools,
8 python-twisted-conch, 8 python3-twisted,
9 sudo, 9 sudo,
10 sysvinit-utils, 10 sysvinit-utils,