Drop check for missing /etc/machine-id on "make check" failure

This isn't happening on current buildds any more, as /etc/machine-id is now
part of debootstrap.
This commit is contained in:
Martin Pitt 2015-11-11 12:33:48 +01:00
parent 15547ff1b6
commit 9d96099481
2 changed files with 3 additions and 2 deletions

2
debian/changelog vendored
View File

@ -18,6 +18,8 @@ systemd (227-3) UNRELEASED; urgency=medium
* Replace reversion of sd_pid_notify_with_fds() msg_controllen fix with
proper upstream fix to never block on sending messages on NOTIFY_SOCKET
socket.
* Drop check for missing /etc/machine-id on "make check" failure; this isn't
happening on current buildds any more.
[ Michael Biebl ]
* Drop dependency on udev from the systemd package. We don't need udev

3
debian/rules vendored
View File

@ -259,8 +259,7 @@ ifeq (, $(filter 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; \
if [ ! -e /etc/machine-id ]; then echo "/etc/machine-id missing, ignoring test failures"; else exit 1; fi; )
for f in test-*.log; do echo "==== $$f ===="; cat $$f; done)
endif
%: