Bug#946235: atk1.0: please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: atk1.0
Version: 2.34.1-1
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 atk1.0 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 atk1.0-2.34.1/debian/tests/build atk1.0-2.34.1/debian/tests/build
--- atk1.0-2.34.1/debian/tests/build	2019-10-10 03:34:07.000000000 -0700
+++ atk1.0-2.34.1/debian/tests/build	2019-12-05 15:11:11.000000000 -0800
@@ -22,7 +22,11 @@
 }
 EOF
 
-gcc -Wall -Werror -o atk1.0-dev_test atk1.0-dev_test.c `pkg-config --cflags --libs atk`
+if [ -n "$DEB_HOST_MULTIARCH" ]; then
+    export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig"
+    PREFIX="$DEB_HOST_GNU_TYPE-"
+fi
+${PREFIX}gcc -Wall -Werror -o atk1.0-dev_test atk1.0-dev_test.c `pkg-config --cflags --libs atk`
 echo "build: OK"
 [ -x atk1.0-dev_test ]
 ./atk1.0-dev_test
diff -Nru atk1.0-2.34.1/debian/tests/tests atk1.0-2.34.1/debian/tests/tests
--- atk1.0-2.34.1/debian/tests/tests	2019-10-10 03:34:07.000000000 -0700
+++ atk1.0-2.34.1/debian/tests/tests	2019-12-05 15:12:09.000000000 -0800
@@ -4,8 +4,12 @@
 
 WORKDIR=$AUTOPKGTEST_TMP
 
+if [ -n "$DEB_HOST_MULTIARCH" ]; then
+    export PKG_CONFIG_PATH="/usr/lib/$DEB_HOST_MULTIARCH/pkgconfig"
+    PREFIX="$DEB_HOST_GNU_TYPE-"
+fi
 for i in testdocument testrole testrelation teststateset testvalue ; do
-	gcc tests/$i.c -o $WORKDIR/$i $(pkg-config --cflags --libs atk)
+	${PREFIX}gcc tests/$i.c -o $WORKDIR/$i $(pkg-config --cflags --libs atk)
 	echo "build: OK"
 	[ -x $WORKDIR/$i ]
 	$WORKDIR/$i