test: move common dependencies from test case to test-root module

diff --git a/modules.d/80test-root/module-setup.sh b/modules.d/80test-root/module-setup.sh
index 29dfb2a0223c91397118c7a6ca13320185c8d814..36635bad250f326b43154d7312cb389b5160aaa9 100755 (executable)
--- a/modules.d/80test-root/module-setup.sh
+++ b/modules.d/80test-root/module-setup.sh
@@ -4,3 +4,18 @@ check() {
     # Only include the module if another module requires it
     return 255
 }
+
+install() {
+    inst_simple /etc/os-release
+
+    inst_multiple mkdir ln dd stty mount poweroff
+
+    for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
+        [ -f ${_terminfodir}/l/linux ] && break
+    done
+    inst_multiple -o ${_terminfodir}/l/linux
+
+    inst_binary "${dracutbasedir}/dracut-util" "/usr/bin/dracut-util"
+    ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
+    ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
+}

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 6df1a9b4e2970499c237111df93e12db7872dafa..927d9831f5176263c5e7bbed1d9b6544e2104645 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -64,21 +64,10 @@ test_setup() {
 
         mv "$TESTDIR"/overlay/tmp/dracut.*/initramfs/* "$initdir" && rm -rf "$TESTDIR"/overlay/tmp
 
-        inst_multiple sh df free ls poweroff stty cat ps ln \
-            mount dmesg mkdir cp \
-            umount strace less setsid dd sync
-        for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
-            [ -f ${_terminfodir}/l/linux ] && break
-        done
-        inst_multiple -o ${_terminfodir}/l/linux
-
-        inst_binary "${basedir}/dracut-util" "/usr/bin/dracut-util"
-        ln -s dracut-util "${initdir}/usr/bin/dracut-getarg"
-        ln -s dracut-util "${initdir}/usr/bin/dracut-getargs"
-
-        inst_multiple grep df
+        inst_multiple sh df free ls cat ps \
+            dmesg cp umount strace less setsid sync grep df
+
         inst_simple ./fstab /etc/fstab
-        inst_simple /etc/os-release
         find_binary plymouth > /dev/null && inst_multiple plymouth
         cp -a /etc/ld.so.conf* "$initdir"/etc
         ldconfig -r "$initdir"