test(DMSQUASH): no need to partition root_erofs disk

diff --git a/test/TEST-16-DMSQUASH/create-root.sh b/test/TEST-16-DMSQUASH/create-root.sh
index 042d9746ba6268fd15d2e58fbf053228cde81ad8..009be80f8c7ea48e43bf98074a4e87476e8b1c8d 100755 (executable)
--- a/test/TEST-16-DMSQUASH/create-root.sh
+++ b/test/TEST-16-DMSQUASH/create-root.sh
@@ -29,14 +29,8 @@ mksquashfs /source /root/testdir/rootfs.img -quiet
 
 # Write the erofs compressed filesystem to the partition
 if [ -e "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs" ]; then
-    sfdisk /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs << EOF
-2048,161792
-EOF
-
-    udevadm settle
-
     echo "Creating erofs"
-    mkfs.erofs /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs-part1 /source
+    mkfs.erofs /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs /source
 fi
 
 # Copy rootfs.img to the NTFS drive if exists

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 4245c20d32829ad2dae17ebd6825d71ca95a70e7..6a1a4fda65f3a5c6496472f83327507d0df98476 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -37,7 +37,7 @@ test_run() {
         "$testdir"/run-qemu \
             "${disk_args[@]}" \
             -boot order=d \
-            -append "$TEST_KERNEL_CMDLINE rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs-part1" \
+            -append "$TEST_KERNEL_CMDLINE rd.live.overlay.overlayfs=1 root=live:/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs" \
             -initrd "$TESTDIR"/initramfs.testing
 
         test_marker_check || return 1