Package: acl
Version: 2.2.53-5
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Hi Guillem,
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 acl 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. The "flaky" tests actually fail with or
without this patch, because the upstream test runner relies on an ld preload
of a just-built .so, but since these tests are flaky I don't consider it a
blocker.
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/
slanga...@ubuntu.com vor...@debian.org
diff -Nru acl-2.2.53/debian/tests/test-build acl-2.2.53/debian/tests/test-build
--- acl-2.2.53/debian/tests/test-build 2019-02-28 17:31:41.000000000 -0600
+++ acl-2.2.53/debian/tests/test-build 2019-12-19 15:51:52.000000000 -0600
@@ -5,6 +5,12 @@
set -u
set -x
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cd "$AUTOPKGTEST_TMP"
cat >example.c <<'EOF'
#include <sys/types.h>
@@ -29,10 +35,10 @@
}
EOF
-gcc -o example example.c $(pkg-config --libs libacl)
+${CROSS_COMPILE}gcc -o example example.c $(${CROSS_COMPILE}pkg-config --libs
libacl)
test -x ./example
./example
-gcc -o example-static example.c $(pkg-config --static --libs libacl)
+${CROSS_COMPILE}gcc -o example-static example.c $(${CROSS_COMPILE}pkg-config
--static --libs libacl)
test -x ./example-static
./example-static
diff -Nru acl-2.2.53/debian/tests/test-func acl-2.2.53/debian/tests/test-func
--- acl-2.2.53/debian/tests/test-func 2019-03-01 06:43:07.000000000 -0600
+++ acl-2.2.53/debian/tests/test-func 2019-12-19 15:52:04.000000000 -0600
@@ -2,6 +2,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="--host=$DEB_HOST_GNU_TYPE"
+else
+ CROSS_COMPILE=
+fi
+
autoreconf -f -i 2>&1
-./configure
+./configure ${CROSS_COMPILE}
make check 2>&1
diff -Nru acl-2.2.53/debian/tests/test-func-root
acl-2.2.53/debian/tests/test-func-root
--- acl-2.2.53/debian/tests/test-func-root 2019-03-01 06:43:09.000000000
-0600
+++ acl-2.2.53/debian/tests/test-func-root 2019-12-19 15:52:04.000000000
-0600
@@ -2,6 +2,12 @@
set -e
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="--host=$DEB_HOST_GNU_TYPE"
+else
+ CROSS_COMPILE=
+fi
+
autoreconf -f -i 2>&1
-./configure
+./configure ${CROSS_COMPILE}
make check 2>&1
