On Fri, 2016-09-30 at 09:00 +0200, Stefan Schantl wrote:

This is an major update to the latest stable version of systemd.

Enable testsuite during buildtime.

Fixes #10962.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

.../patches/systemd-231-ipfire-disable-tests.patch | 58 ++++++++++++++++++++++  systemd/systemd.nm                                 | 32 ++++++++++--  2 files changed, 85 insertions(+), 5 deletions(-)  create mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch

diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch new file mode 100644 index 0000000..cd4bbe9 --- /dev/null +++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch @@ -0,0 +1,58 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2016-07-25 21:49:47.000000000 +0200 ++++ b/Makefile.am 2016-09-23 08:34:47.924257243 +0200 +@@ -1480,9 +1480,7 @@ +  test-job-type \ +  test-env-util \ +  test-strbuf \ +- test-strv \ +  test-path \ +- test-path-util \ +  test-strxcpyx \ +  test-siphash24 \ +  test-unit-name \ +@@ -1541,7 +1539,6 @@ +  test-capability \ +  test-async \ +  test-ratelimit \ +- test-condition \ +  test-uid-range \ +  test-locale-util \ +  test-execute \ +@@ -3586,11 +3583,9 @@ +

• tests += \

+  test-dhcp-option \ +- test-dhcp-client \ +  test-dhcp-server \ +  test-ipv4ll \ +  test-ndisc-rs \ +- test-dhcp6-client \ +  test-lldp +

• # --------------------------------------------------------------------------

---

+@@ -4298,16 +4293,11 @@ +  catalog-remove-hook +

• tests += \

+- test-journal \ +  test-journal-enum \ +  test-journal-send \ +  test-journal-syslog \ +  test-journal-match \ +- test-journal-stream \ +  test-journal-init \ +- test-journal-verify \ +- test-journal-interleaving \ +- test-journal-flush \ +  test-mmap-cache \ +  test-catalog \ +  test-audit-type +@@ -6518,7 +6508,6 @@ +  test-libudev-sym.c +

• tests += \

+- test-libsystemd-sym \ +  test-libudev-sym +

• .PHONY: cppcheck

Why are all these tests disabled? It is not obvious to me for most of them.

diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 585916b..6d25ed2 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@  ############################################################################# ##    name       = systemd -version    = 221 -release    = 5 +version    = 231 +release    = 1    maintainer = Stefan Schantl stefan.schantl@ipfire.org  groups     = System/Base @@ -18,13 +18,20 @@ description   SysV and LSB init scripts.  end   -source_dl  = http://www.freedesktop.org/software/systemd/ -sources    = %{thisapp}.tar.xz +source_dl  = https://github.com/%%7Bname%7D/%%7Bname%7D/archive/v%%7Bversion%7D.tar.gz#/    build   unitdir = %{prefix}/lib/systemd/system     requires

• # Testsuite
  

• /usr/bin/getfacl
  

• /usr/bin/mount
  

• /usr/bin/tree
  

• /usr/bin/umount
  

• autoconf
  

• automake
  

attr-devel   audit-devel   cryptsetup-luks-devel >= 1.4.2 @@ -37,7 +44,7 @@ build   gobject-introspection-devel >= 1.31   gperf   hwdata

• intltool
  

• intltool >= 0.51.0
  

kmod-devel >= 15   libacl-devel   libblkid-devel @@ -45,6 +52,7 @@ build   libgcrypt-devel   libmount-devel   libselinux-devel

• libtool
  

libuuid-devel   m4   pam-devel @@ -82,6 +90,20 @@ build     prepare_cmds   %{create_groups}

• ./autogen.sh
  

• end
• test

• # Create symlink so the testsuite will be able to find the
  

shared lib.

• ln -sv %{DIR_APP}/.libs/libsystemd-shared.so \
  

• 	%{libdir}/libsystemd-shared-%{version}.so
  

Could you please use LD_LIBRARY_PATH like we use it for all the other packages, too?

• # Create dummy machine-id file, which is required for some
  

tests.

• touch %{sysconfdir}/machine-id
  

• # Run the testsuite.
  

• make check
  

end     install_cmds