proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-10 01:46:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This is the case in a few buildd chroots still.

Closes: #787258
This commit is contained in:
Martin Pitt 2015-06-03 08:42:47 +02:00
parent 364fc07eab
commit 865ca5e8b7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -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

5
debian/rules vendored
View File

@ -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
%: