From: Laszlo Gombos Date: Wed, 19 Oct 2022 00:25:11 +0000 (+0000) Subject: test: move common dependencies from test case to test-makeroot module X-Git-Tag: 058~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2532113c445e2c10562243647ecd2d85a35f9347;p=thirdparty%2Fdracut.git 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 798c7b8de..bc6193e4f 100755 --- 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 bfb874a2b..aea3422ef 100755 --- 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 )