Bug#946292: at-spi2-atk: please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: at-spi2-atk
Version: 2.34.1-2
Severity: minor
Tags: patch
User: ubuntu-devel at 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 at-spi2-atk tests currently fail in this environment, because they are
build tests that do not invoke the toolchain in a cross-aware manner.  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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
diff -Nru at-spi2-atk-2.34.1/debian/tests/tests at-spi2-atk-2.34.1/debian/tests/tests
--- at-spi2-atk-2.34.1/debian/tests/tests	2019-10-01 12:59:33.000000000 -0700
+++ at-spi2-atk-2.34.1/debian/tests/tests	2019-12-05 21:28:39.000000000 -0800
@@ -8,7 +8,19 @@
 patch -p1 < debian/patches/use_system_atk_adaptor.patch 2>&1 || true
 
 cd $WORKDIR
-meson $SRCDIR 2>&1
+if [ -n "$DEB_HOST_MULTIARCH" ]; then
+    export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig"
+    cross_file=cross_file.txt
+    cat > $cross_file <<EOF
+[binaries]
+c = '/usr/bin/$DEB_HOST_GNU_TYPE-gcc'
+cpp = '/usr/bin/$DEB_HOST_GNU_TYPE-g++'
+ar = '/usr/bin/$DEB_HOST_GNU_TYPE-ar'
+strip = '/usr/bin/$DEB_HOST_GNU_TYPE-strip'
+EOF
+fi
+
+meson $SRCDIR ${cross_file:+--cross-file $cross_file} 2>&1
 ninja -v 2>&1
 xvfb-run -s -noreset -a dbus-run-session --dbus-daemon $SRCDIR/debian/tests/dbus-daemon -- ninja test -v