Drop "set -x" verbosity from the autopkgtest

I think we can do without this in most cases nowadays, as things have
been pretty stable for a while.

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
 
   * Add GitLab CI configuration.
   * Make the autopkgtest create /run/sshd if it doesn't already exist.
+  * Drop "set -x" verbosity from the autopkgtest; I think we can do without
+    this in most cases nowadays.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 03 Nov 2018 16:28:16 +0000
 
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 @@
 #! /bin/sh
-set -ex
+set -e
 
 if [ "$(id -un)" != openssh-tests ]; then
         TMP="$ADTTMP/user"
@@ -92,7 +92,6 @@ annotate-output +%H:%M:%S.%N make -C regress \
         BUILDDIR="$BUILDDIR" \
         OBJ="$BUILDDIR/regress" \
         SUDO=sudo \
-        TEST_SHELL='sh -x' \
         TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
         TEST_SSH_PLINK=plink \
         TEST_SSH_PUTTYGEN=puttygen \