From 24be78d72b931b0175f08cee12fd23d631c024bf Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 15 Jan 2016 23:58:45 +0000
Subject: tests: remove unnecessary --boot

* Use $ROOTLIBDIR/systemd always
* Don't pass $ROOTLIBDIR/systemd as the first argument:

$ cat /proc/1/cmdline
/lib/systemd/systemd/lib/systemd/systemd...
---
 test/test-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/test-functions')

diff --git a/test/test-functions b/test/test-functions
index 03753db38a..ce6185b66e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -92,7 +92,7 @@ $KERNEL_APPEND \
 
 run_nspawn() {
     set -x
-    ../../systemd-nspawn --register=no --boot --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
+    ../../systemd-nspawn --register=no --directory=$TESTDIR/nspawn-root $ROOTLIBDIR/systemd $KERNEL_APPEND
 }
 
 setup_basic_environment() {
-- 
cgit v1.2.3-54-g00ecf


From 9974ff63b182e67bf3d3d9262e2bfa84f0a1378b Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sat, 16 Jan 2016 08:06:59 +0000
Subject: tests: install fsck*

systemd-fsck depends on /sbin/fsck*
---
 test/test-functions | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'test/test-functions')

diff --git a/test/test-functions b/test/test-functions
index ce6185b66e..d6be7f867d 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -111,6 +111,7 @@ setup_basic_environment() {
     install_keymaps
     install_terminfo
     install_execs
+    install_fsck
     install_plymouth
     install_debug_tools
     install_ld_so_conf
@@ -149,6 +150,11 @@ EOF
     chmod 0755 $_valgrind_wrapper
 }
 
+install_fsck() {
+    dracut_install /sbin/fsck*
+    dracut_install -o /bin/fsck*
+}
+
 install_dmevent() {
     instmods dm_crypt =crypto
     type -P dmeventd >/dev/null && dracut_install dmeventd
-- 
cgit v1.2.3-54-g00ecf


From ac289ce3f5eb3f13806f7c631c6b23cee18b26da Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Sun, 17 Jan 2016 03:32:37 +0000
Subject: tests: fix TEST-02-CRYPTSETUP on Debian/Ubuntu

---
 test/test-functions | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test/test-functions')

diff --git a/test/test-functions b/test/test-functions
index d6be7f867d..55d43134ea 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -159,7 +159,13 @@ install_dmevent() {
     instmods dm_crypt =crypto
     type -P dmeventd >/dev/null && dracut_install dmeventd
     inst_libdir_file "libdevmapper-event.so*"
-    inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
+    if [[ "$LOOKS_LIKE_DEBIAN" ]]; then
+        # dmsetup installs 55-dm and 60-persistent-storage-dm on Debian/Ubuntu
+        # see https://anonscm.debian.org/cgit/pkg-lvm/lvm2.git/tree/debian/patches/0007-udev.patch
+        inst_rules 55-dm.rules 60-persistent-storage-dm.rules
+    else
+        inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules
+    fi
 }
 
 install_systemd() {
-- 
cgit v1.2.3-54-g00ecf


From 5a613464fa15c0960b418322f592a24b9e0f7455 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Mon, 18 Jan 2016 06:45:20 +0000
Subject: tests: add STRIP_BINARIES

We need a beautiful stacktraces sometimes
For example https://github.com/systemd/systemd/pull/2328
---
 test/test-functions | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test/test-functions')

diff --git a/test/test-functions b/test/test-functions
index 55d43134ea..961a6254d8 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -212,6 +212,10 @@ check_result_nspawn() {
 }
 
 strip_binaries() {
+    if [[ "$STRIP_BINARIES" = "no" ]]; then
+        ddebug "Don't strip binaries"
+        return 0
+    fi
     ddebug "Strip binaries"
     find "$initdir" -executable -not -path '*/lib/modules/*.ko' -type f | xargs strip --strip-unneeded | ddebug
 }
-- 
cgit v1.2.3-54-g00ecf