[DRE-maint] Bug#949563: ruby-defaults: Please make autopkgtests cross-test-friendly

[Steve Langasek]

Package: ruby-defaults
Version: 1:2.5.2
Severity: minor
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

Hi Antonio,

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 ruby-defaults tests currently fail in this environment, because one of
them invokes pkg-config to check for correct registration of the .pc file. 
However, it does not invoke pkg-config 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 ruby-defaults-2.5.2/debian/tests/control ruby-defaults-2.5.2ubuntu1/debian/tests/control
--- ruby-defaults-2.5.2/debian/tests/control	2019-10-16 15:30:22.000000000 -0700
+++ ruby-defaults-2.5.2ubuntu1/debian/tests/control	2020-01-21 16:12:51.000000000 -0800
@@ -6,5 +6,5 @@
 Depends: ruby, ruby-all-dev
 Restrictions: allow-stderr
 
-Test-Command: pkg-config --cflags --libs ruby
+Test-Command: ${DEB_HOST_GNU_TYPE:+$DEB_HOST_GNU_TYPE-}pkg-config --cflags --libs ruby
 Depends: ruby-dev, pkg-config