summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/tests/regress3
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9368bfee6..f4a1870d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:7.9p1-2) UNRELEASED; urgency=medium
2 2
3 * Add GitLab CI configuration. 3 * Add GitLab CI configuration.
4 * Make the autopkgtest create /run/sshd if it doesn't already exist. 4 * Make the autopkgtest create /run/sshd if it doesn't already exist.
5 * Drop "set -x" verbosity from the autopkgtest; I think we can do without
6 this in most cases nowadays.
5 7
6 -- Colin Watson <cjwatson@debian.org> Sat, 03 Nov 2018 16:28:16 +0000 8 -- Colin Watson <cjwatson@debian.org> Sat, 03 Nov 2018 16:28:16 +0000
7 9
diff --git a/debian/tests/regress b/debian/tests/regress
index 1c7a756f0..7230f6ce1 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -1,5 +1,5 @@
1#! /bin/sh 1#! /bin/sh
2set -ex 2set -e
3 3
4if [ "$(id -un)" != openssh-tests ]; then 4if [ "$(id -un)" != openssh-tests ]; then
5 TMP="$ADTTMP/user" 5 TMP="$ADTTMP/user"
@@ -92,7 +92,6 @@ annotate-output +%H:%M:%S.%N make -C regress \
92 BUILDDIR="$BUILDDIR" \ 92 BUILDDIR="$BUILDDIR" \
93 OBJ="$BUILDDIR/regress" \ 93 OBJ="$BUILDDIR/regress" \
94 SUDO=sudo \ 94 SUDO=sudo \
95 TEST_SHELL='sh -x' \
96 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \ 95 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
97 TEST_SSH_PLINK=plink \ 96 TEST_SSH_PLINK=plink \
98 TEST_SSH_PUTTYGEN=puttygen \ 97 TEST_SSH_PUTTYGEN=puttygen \