From: Hilko Bengen Date: Fri, 14 Jan 2022 15:15:37 +0000 (+0100) Subject: Attempt to fix FTBFS on non-x86 architectures X-Git-Tag: archive/raspbian/1.52.3-1+rpi1^2^2^2^2~48 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df445145e5cbff702cc53e8b127c2414506f5093;p=guestfs-tools.git Attempt to fix FTBFS on non-x86 architectures - For now, run tests only on x86, arm64, riscv64 - Set backend - Enable debug, trace --- diff --git a/debian/rules b/debian/rules index dc1ffbd..fe2daf4 100755 --- a/debian/rules +++ b/debian/rules @@ -7,13 +7,28 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +include /usr/share/dpkg/architecture.mk + # Disable because the test seems to hang. export SKIP_RHBZ1285847_SH=1 export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1 +TEST_ARCHITECTURES := i386 amd64 arm64 riscv64 + %: dh $@ +override_dh_auto_test: +ifneq "" "$(findstring $(DEB_HOST_ARCH),$(TEST_ARCHITECTURES))" + printenv + unset XDG_RUNTIME_DIR; \ + if ! test -w /dev/kvm; then \ + export LIBGUESTFS_BACKEND_SETTINGS=force_tcg; \ + fi; \ + export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1; \ + $(MAKE) check +endif + override_dh_auto_install: dh_auto_install sed -i -e '1s,.*,#!/usr/bin/perl,' debian/guestfs-tools/usr/bin/virt-win-reg