Merge ~sergiodj/ubuntu/+source/mosh:ubuntu/devel into ubuntu/+source/mosh:ubuntu/devel

[Sergio Durigan Junior]

This MP implements mosh's dep8 test, as required by the MIR team in order to proceed with the process.

This dep8 test runs mosh's upstream testsuite. Unfortunately, there are a few idiosyncrasies that we have to overcome, so this script is a bit hacky.

- The testsuite contains hardcoded references to mosh's binaries, and will always try to use the locally-built ones. So we have to patch it and make it use the system-wide mosh instead.

- The testsuite contains a few .c files that are built for testing, and they expect the software to have been built before. So we need to build the package during the dep8 test.

- Logging is somewhat poorly done, so it's not always easy to extract useful info from it.

Nevertheless, I think this is a step in the right direction. I intend to also submit this to Debian.

autopkgtest [16:18:50]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-tests PASS

[Christian Ehrhardt  (paelzer)]

Thank you so much Sergio, this is much more than a small first step!

[Robie Basak (racb)]

This looks great, thanks!

According to the autopkgtest spec, changing the source tree is not permitted, so I'll add a commit to take a copy first.

One inline comment - I'll add a commit for that, too.

So I have a couple of changes to this to propose back to you, and a separate smoke dep8 test to add. I'll submit my own MP that builds on your commits, and then supersede this one.

Personally I think the name debian/tests/upstream-tests has a redundant "tests" in there. I'd use debian/tests/upstream instead. Admittedly upstream-tests is the name the hello package uses. But it doesn't matter :)

Unmerged commits

57a8c1a... by Sergio Durigan Junior on 2023-03-21

changelog

aeb215d... by Sergio Durigan Junior on 2023-03-21

update-maintainer

bf3b6d1... by Sergio Durigan Junior on 2023-03-21

  * d/t/upstream-tests: New dep8 test which runs the upstream test
    suite against a system mosh.

diff --git a/debian/changelog b/debian/changelog
index af36f16..f2b7532 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mosh (1.4.0-1ubuntu1) lunar; urgency=medium
+
+  * d/t/upstream-tests: New dep8 test which runs the upstream test
+    suite against a system mosh.
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 21 Mar 2023 15:56:42 -0400
+
 mosh (1.4.0-1build1) lunar; urgency=medium
 
   * Rebuild against new libprotobuf32.
diff --git a/debian/control b/debian/control
index 6908e92..ea7df0e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: mosh
 Section: net
 Priority: optional
-Maintainer: Keith Winstein <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Keith Winstein <[e-mail]>
 Uploaders: Alex Chernyakhovsky <[e-mail]>, Benjamin Barenblat <[e-mail]>
 Build-Depends: debhelper-compat (= 12), protobuf-compiler, libprotobuf-dev, pkg-config, libutempter-dev, zlib1g-dev, libncurses5-dev, libssl-dev, bash-completion, locales <!nocheck>, tmux <!nocheck>, less <!nocheck>
 Rules-Requires-Root: binary-targets
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..1596a19
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,3 @@
+Tests: upstream-tests
+Depends: @, @builddeps@
+Restrictions: allow-stderr
diff --git a/debian/tests/upstream-tests b/debian/tests/upstream-tests
new file mode 100755
index 0000000..7694e09
--- /dev/null
+++ b/debian/tests/upstream-tests
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -e
+
+# Build mosh.  We need to do this because some of the test programs
+# expect to link against libraries built here.
+#
+# We could use "Restrictions: build-needed" on d/t/control, but that'd
+# also invoke dh_auto_test which only wastes our time.
+echo "I: Building mosh"
+./debian/rules override_dh_auto_configure
+make -j$(nproc)
+
+# Remove all possible local mosh binaries that could confuse the test
+# suite.
+echo "I: Removing all locally-built mosh binaries"
+rm -fv \
+   scripts/mosh \
+   src/frontend/mosh-client \
+   src/frontend/mosh-server \
+   src/tests/mosh-client \
+   src/tests/mosh-server
+
+# Adjust mosh's test scripts to use mosh-{client,server} from the
+# system.
+echo "I: Adjusting mosh's test suite to use the system-installed mosh binaries"
+find src/tests/ -type f | xargs sed -i \
+    -e 's@ --client=.\?[^ ]*\/mosh-client.\? @ --client=/usr/bin/mosh-client @' \
+    -e 's@ --server=.\?[^ ]*\/mosh-server.\? @ --server=/usr/bin/mosh-server @' \
+    -e 's@\.\.\/\.\.\/scripts\/mosh@/usr/bin/mosh@' \
+    -e 's@export MOSH_CLIENT=.*@export MOSH_CLIENT="/usr/bin/mosh-client"@' \
+    -e 's@export MOSH_SERVER=.*@export MOSH_SERVER="/usr/bin/mosh-server"@'
+
+echo "I: Running tests"
+if ! make check; then
+    echo "E: Testsuite failed to run:"
+    if [ -f src/tests/test-suite.log ]; then
+	echo
+	cat src/tests/test-suite.log
+    fi
+    exit 1
+fi
+
+exit 0