Bug#946443: libnotify: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: libnotify
Version: 0.7.8-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 libnotify tests currently fail in this environment, because they are
build tests that do not invoke the toolchain in a cross-aware manner, and
also because they declare a test dependency on a virtual package
'notification-daemon' which may or may not be cross-installable.  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 libnotify-0.7.8/debian/tests/build libnotify-0.7.8/debian/tests/build
--- libnotify-0.7.8/debian/tests/build	2019-08-14 03:48:50.000000000 -0700
+++ libnotify-0.7.8/debian/tests/build	2019-12-08 13:39:28.000000000 -0800
@@ -9,6 +9,13 @@
 WORKDIR=$(mktemp -d)
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
 cd $WORKDIR
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+    CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+    CROSS_COMPILE=
+fi
+
 cat <<EOF > libnotify_test.c
 #include <libnotify/notify.h>
 #include <assert.h>
@@ -33,8 +40,8 @@
 }
 EOF
 
-gcc -o libnotify_test libnotify_test.c \
-`pkg-config --cflags --libs libnotify` -Wall -Werror
+${CROSS_COMPILE}gcc -o libnotify_test libnotify_test.c \
+`${CROSS_COMPILE}pkg-config --cflags --libs libnotify` -Wall -Werror
 echo "build: OK"
 [ -x libnotify_test ]
 dbus-run-session -- xvfb-run ./libnotify_test
diff -Nru libnotify-0.7.8/debian/tests/control libnotify-0.7.8/debian/tests/control
--- libnotify-0.7.8/debian/tests/control	2019-08-14 03:48:50.000000000 -0700
+++ libnotify-0.7.8/debian/tests/control	2019-12-08 20:21:11.000000000 -0800
@@ -1,2 +1,2 @@
 Tests: build
-Depends: build-essential, dbus (>= 1.8), notification-daemon, xauth, xvfb, libnotify-dev, pkg-config
+Depends: build-essential, dbus (>= 1.8), notification-daemon:native, xauth, xvfb, libnotify-dev, pkg-config