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

poweroff cp umount sync dd are commonly used by test cases to make
root filesystem.

diff --git a/modules.d/80test-makeroot/module-setup.sh b/modules.d/80test-makeroot/module-setup.sh
index 798c7b8dedd6f84afe65dbb41a059ced23557ddc..bc6193e4fa1e4e54f78faca5d2ba93c9f6b92497 100755 (executable)
--- a/modules.d/80test-makeroot/module-setup.sh
+++ b/modules.d/80test-makeroot/module-setup.sh
@@ -8,3 +8,7 @@ check() {
 depends() {
     echo "qemu"
 }
+
+install() {
+    inst_multiple poweroff cp umount sync dd
+}

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index bfb874a2b9593ba3e6084e72a9b383e31a4fc9e0..aea3422ef381e46d7ca21256f175116d304d4a21 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -88,7 +88,7 @@ test_setup() {
         export initdir=$TESTDIR/overlay
         # shellcheck disable=SC1090
         . "$basedir"/dracut-init.sh
-        inst_multiple sfdisk mkfs.btrfs btrfs poweroff cp umount sync dd
+        inst_multiple sfdisk mkfs.btrfs btrfs
         inst_hook initqueue 01 ./create-root.sh
         inst_hook initqueue/finished 01 ./finished-false.sh
     )