Bug#965131: libtommath: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: libtommath
Version: 1.2.0-4
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu groovy ubuntu-patch

Dear maintainers,

In Ubuntu, we have moved 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 libtommath tests currently fail in this environment, because they are
build tests that do not invoke the toolchain in a cross-aware manner, and do
not declare their test dependencies in a cross-friendly matter.  I've
verified that the attached patch lets the tests successfully build 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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru libtommath-1.2.0/debian/tests/control libtommath-1.2.0/debian/tests/control
--- libtommath-1.2.0/debian/tests/control	2020-06-07 09:29:38.000000000 -0700
+++ libtommath-1.2.0/debian/tests/control	2020-07-16 08:28:01.000000000 -0700
@@ -1,3 +1,3 @@
 Tests: run-tests
 Restrictions: allow-stderr
-Depends: @, gcc, libc-dev
+Depends: @, build-essential
diff -Nru libtommath-1.2.0/debian/tests/run-tests libtommath-1.2.0/debian/tests/run-tests
--- libtommath-1.2.0/debian/tests/run-tests	2020-06-07 09:29:38.000000000 -0700
+++ libtommath-1.2.0/debian/tests/run-tests	2020-07-16 08:28:10.000000000 -0700
@@ -2,8 +2,14 @@
 
 set -e
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+  CC="$DEB_HOST_GNU_TYPE-gcc"
+else
+  CC=gcc
+fi
+
 echo "creating test binaries"
-make test
+make test CC="$CC"
 
 echo "Runing test"
 ./test