|
Package: libvncserver Version: 0.9.12+dfsg-3 Severity: minor Tags: patch User: ubuntu-devel@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 libssh 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, |
diff -Nru libvncserver-0.9.12+dfsg/debian/changelog libvncserver-0.9.12+dfsg/debian/changelog
--- libvncserver-0.9.12+dfsg/debian/changelog 2019-12-11 17:25:41.000000000 +0100
+++ libvncserver-0.9.12+dfsg/debian/changelog 2019-12-11 23:26:23.000000000 +0100
@@ -1,3 +1,11 @@
+libvncserver (0.9.12+dfsg-5) unstable; urgency=medium
+
+ * debian/tests:
+ - Use the correct compiler for proposed autopkgtest cross-testing
+ support.
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Wed, 11 Dec 2019 23:26:00 +0100
+
libvncserver (0.9.12+dfsg-4) unstable; urgency=medium
.
[ Antoni Villalonga ]
diff -Nru libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncclient libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncclient
--- libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncclient 2019-12-11 08:01:51.000000000 +0100
+++ libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncclient 2019-12-11 23:25:54.000000000 +0100
@@ -2,6 +2,13 @@
set -e
cd "$AUTOPKGTEST_TMP"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cat > test.c << EOF
#include <rfb/rfbclient.h>
@@ -14,6 +21,6 @@
}
EOF
-gcc -Wall -o test test.c -lvncclient
+${CROSS_COMPILE}gcc -Wall -o test test.c -lvncclient
./test
objdump -p test | grep "libvncclient"
diff -Nru libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncserver libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncserver
--- libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncserver 2019-12-11 08:01:51.000000000 +0100
+++ libvncserver-0.9.12+dfsg/debian/tests/smoketest-libvncserver 2019-12-11 23:25:38.000000000 +0100
@@ -2,6 +2,13 @@
set -e
cd "$AUTOPKGTEST_TMP"
+
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+ CROSS_COMPILE="$DEB_HOST_GNU_TYPE-"
+else
+ CROSS_COMPILE=
+fi
+
cat > test.c << EOF
#include <rfb/rfb.h>
#include <stdio.h>
@@ -16,6 +23,6 @@
}
EOF
-gcc -Wall -o test test.c -lvncserver
+${CROSS_COMPILE}gcc -Wall -o test test.c -lvncserver
./test
objdump -p test | grep "libvncserver"