Ignore test failures during build if /etc/machine-id is missing

This is the case in a few buildd chroots still.

Closes: #787258

diff --git a/debian/changelog b/debian/changelog
index ba72b6e6ca60ce6fe1fe36d6cd173288502623dd..1899cfcc2769c9bd96414dd3d299084800e4099b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ systemd (220-5) UNRELEASED; urgency=medium
   * debian/control: Replace obsolete Python2 version header with
     X-Python3-Version.
   * dracut: Fix path to systemd-fsck. (Closes: #787553)
+  * Ignore test failures during build if /etc/machine-id is missing (which is
+    the case in a few buildd chroots still). (Closes: #787258)
 
  -- Martin Pitt <mpitt@debian.org>  Wed, 03 Jun 2015 08:23:26 +0200
 

diff --git a/debian/rules b/debian/rules
index f7c3e4297303aca409b89abe4d81192a3d51f53e..08718abf32c5e92888d19af3eaa938139c6abcbd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -250,15 +250,14 @@ override_dh_autoreconf:
 override_dh_strip:
        dh_strip --dbg-package=systemd-dbg
 
-# on the mipsel buildds we get some test failures which aren't reproducible on
-# the porter box (https://bugs.debian.org/787258)
+# tests require /etc/machine-id to be present
 override_dh_auto_test:
 ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
        # some tests hang under fakeroot, so disable fakeroot
        env -u LD_PRELOAD make -C build-deb check || ( \
                cd build-deb; \
                for f in test-*.log; do echo "==== $$f ===="; cat $$f; done; \
-               [ "$(dpkg --print-architecture)" = "mipsel" ] || exit 1; )
+               if [ ! -e /etc/machine-id ]; then echo "/etc/machine-id missing, ignoring test failures"; else exit 1; fi; )
 endif
 
 %: