Package: iproute2
Version: 5.4.0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Dear maintainers,
In Ubuntu, we are in the process of moving the i386 architecture to a
compatibility-only layer on amd64, and therefore we are also moving our
autopkgtest infrastructure to test i386 binaries in a cross-environment.
This requires changes to some tests so that they are cross-aware and can do
the right thing.
The iproute2 tests currently fail in this environment, because they include
a build test that does not invoke the toolchain in a cross-aware manner and
because they try to install cross versions of base packages when they should
use the available host versions. I've verified that the attached patch lets
the tests successfully build (and run) i386 tests on an amd64 host.
Note that upstream autopkgtest doesn't currently set DEB_HOST_ARCH so this
is a complete no-op in Debian for the moment. Support for cross-testing in
autopkgtest is currently awaiting review at
https://salsa.debian.org/ci-team/autopkgtest/merge_requests/69 and once
landed, will still have no effect unless autopkgtest is invoked with a '-a'
option. So this change should be safe to land in your package despite this
not being upstream in autopkgtest.
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru iproute2-5.4.0/debian/tests/control
iproute2-5.4.0/debian/tests/control
--- iproute2-5.4.0/debian/tests/control 2019-11-28 02:47:08.000000000 -0800
+++ iproute2-5.4.0/debian/tests/control 2020-01-21 16:35:46.000000000 -0800
@@ -2,4 +2,5 @@
# therefore do not run as build time tests
Tests: testsuite.sh
Restrictions: allow-stderr, isolation-machine, needs-root, rw-build-tree
-Depends: build-essential, locales-all, dpkg-dev, sudo, kmod, @builddeps@
+Depends: build-essential, locales-all, dpkg-dev, sudo:native, kmod, @builddeps@
+
diff -Nru iproute2-5.4.0/debian/tests/testsuite.sh
iproute2-5.4.0/debian/tests/testsuite.sh
--- iproute2-5.4.0/debian/tests/testsuite.sh 2019-11-28 02:47:08.000000000
-0800
+++ iproute2-5.4.0/debian/tests/testsuite.sh 2020-01-21 16:35:46.000000000
-0800
@@ -1,10 +1,16 @@
#!/bin/sh
set -uxe
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ vars="CC=$DEB_HOST_GNU_TYPE-gcc LD=$DEB_HOST_GNU_TYPE-ld"
+else
+ vars=""
+fi
+
# copy built-tree to tmp test dir to gurantee no files are left behind
dir=$(mktemp -d)
cp -a . "${dir}"
cd "${dir}"
# build and run tests
-make check
+make $vars check
