tests: Make sushell optional in image creation

[elogind.git] / test / test-functions

diff --git a/test/test-functions b/test/test-functions
index 8e300b10ef6754c6d277c8c17070bac95bca2258..91f3ecd52be6f51ba56fec3727c74aea2a92c657 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -7,7 +7,7 @@ export PATH
 KERNEL_VER=${KERNEL_VER-$(uname -r)}
 KERNEL_MODS="/lib/modules/$KERNEL_VER/"
 
-BASICTOOLS="sh bash setsid loadkeys setfont login sushell sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
+BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
 DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort"
 
 function find_qemu_bin() {
@@ -66,11 +66,13 @@ $KERNEL_APPEND \
         QEMU_OPTIONS="$QEMU_OPTIONS -initrd $INITRD"
     fi
 
-    $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img || return 1
+    ( set -x
+      $QEMU_BIN $QEMU_OPTIONS -append "$KERNEL_APPEND" $TESTDIR/rootdisk.img ) || return 1
 }
 
 run_nspawn() {
-    ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root /usr/lib/systemd/systemd
+    set -x
+    ../../systemd-nspawn --boot --directory=$TESTDIR/nspawn-root /usr/lib/systemd/systemd $KERNEL_APPEND
 }
 
 setup_basic_environment() {
@@ -108,7 +110,7 @@ install_dmevent() {
 
 install_systemd() {
     # install compiled files
-    (cd $TEST_BASE_DIR/..; make DESTDIR=$initdir install)
+    (cd $TEST_BASE_DIR/..; set -x; make DESTDIR=$initdir install)
     # remove unneeded documentation
     rm -fr $initdir/usr/share/{man,doc,gtk-doc}
     # we strip binaries since debug symbols increase binaries size a lot
@@ -225,6 +227,7 @@ EOF
 
 install_basic_tools() {
     [[ $BASICTOOLS ]] && dracut_install $BASICTOOLS
+    dracut_install -o sushell
 }
 
 install_debug_tools() {
@@ -270,6 +273,7 @@ install_keymaps() {
 
 install_fonts() {
     for i in \
+        /usr/lib/kbd/consolefonts/eurlatgr* \
         /usr/lib/kbd/consolefonts/latarcyrheb-sun16*; do
             [[ -f $i ]] || continue
             inst $i