test: add empty default test_cleanup implementation

[thirdparty/dracut.git] / test / TEST-03-USR-MOUNT / test.sh

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 80d2678560a0457b5cd857297490cf745831bff8..029d12f0fccf003b6b5b95b3d0ddf11c43d380fb 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -3,8 +3,6 @@
 # shellcheck disable=SC2034
 TEST_DESCRIPTION="root filesystem on a btrfs filesystem with /usr subvolume"
 
-KVERSION=${KVERSION-$(uname -r)}
-
 # Uncomment this to debug failures
 #DEBUGFAIL="rd.shell rd.break"
 
@@ -15,20 +13,20 @@ client_run() {
 
     echo "CLIENT TEST START: $test_name"
 
-    dd if=/dev/zero of="$TESTDIR"/marker.img bs=1MiB count=1
     declare -a disk_args=()
     declare -i disk_index=0
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/root.btrfs root
     qemu_add_drive_args disk_index disk_args "$TESTDIR"/usr.btrfs usr
 
+    test_marker_reset
     "$testdir"/run-qemu \
         "${disk_args[@]}" \
-        -watchdog i6300esb -watchdog-action poweroff \
+        -device i6300esb -watchdog-action poweroff \
         -append "panic=1 oops=panic softlockup_panic=1 systemd.crash_reboot root=LABEL=dracut $client_opts loglevel=7 rd.retry=3 rd.info console=ttyS0,115200n81 selinux=0 rd.debug rd.shell=0 $DEBUGFAIL" \
         -initrd "$TESTDIR"/initramfs.testing || return 1
 
-    if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-success "$TESTDIR"/marker.img; then
+    if ! test_marker_check; then
         echo "CLIENT TEST END: $test_name [FAILED]"
         return 1
     fi
@@ -69,14 +67,11 @@ test_setup() {
     rm -rf -- "$TESTDIR"/overlay
 
     # Create the blank file to use as a root filesystem
-    dd if=/dev/zero of="$TESTDIR"/root.btrfs bs=1MiB count=160
-    dd if=/dev/zero of="$TESTDIR"/usr.btrfs bs=1MiB count=160
-    dd if=/dev/zero of="$TESTDIR"/marker.img bs=1MiB count=1
     declare -a disk_args=()
     declare -i disk_index=0
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/root.btrfs root
-    qemu_add_drive_args disk_index disk_args "$TESTDIR"/usr.btrfs usr
+    qemu_add_drive_args disk_index disk_args "$TESTDIR"/marker.img marker 1
+    qemu_add_drive_args disk_index disk_args "$TESTDIR"/root.btrfs root 160
+    qemu_add_drive_args disk_index disk_args "$TESTDIR"/usr.btrfs usr 160
 
     # Invoke KVM and/or QEMU to actually create the target filesystem.
     "$testdir"/run-qemu \
@@ -84,7 +79,7 @@ test_setup() {
         -append "root=/dev/dracut/root rw rootfstype=btrfs quiet console=ttyS0,115200n81 selinux=0" \
         -initrd "$TESTDIR"/initramfs.makeroot || return 1
 
-    if ! grep -U --binary-files=binary -F -m 1 -q dracut-root-block-created "$TESTDIR"/marker.img; then
+    if ! test_marker_check dracut-root-block-created; then
         echo "Could not create root filesystem"
         return 1
     fi
@@ -98,9 +93,5 @@ test_setup() {
     rm -rf -- "$TESTDIR"/overlay
 }
 
-test_cleanup() {
-    return 0
-}
-
 # shellcheck disable=SC1090
 . "$testdir"/test-functions