diff options
| author | Daniel Mack <github@zonque.org> | 2016-01-18 10:51:19 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-01-18 10:51:19 +0100 |
| commit | e1333db540c64bf8c3692c5330e661da0b4dcecc (patch) | |
| tree | b088dd30eaebc354ac860bc66c865b397f664217 /test/test-functions | |
| parent | 3855df576fc7b7ff6dd20f51bd16acacb195ac5d (diff) | |
| parent | 5a613464fa15c0960b418322f592a24b9e0f7455 (diff) | |
Merge pull request #2349 from evverx/test-functions-cleanup
tests: various fixes
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/test/test-functions b/test/test-functions index 03753db38a..961a6254d8 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() { @@ -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,11 +150,22 @@ 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 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() { @@ -200,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 } |