From 2ae73fc2f208a5e9404f1b50512347f082a39ac2 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Thu, 29 Jan 2026 23:22:17 +0100
Subject: [PATCH 1/2] test: always test erofs

---
 test/TEST-30-DMSQUASH/test.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index 97ead4470e..2db7f88463 100755
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -14,6 +14,12 @@ test_check() {
         echo "Test needs mksquashfs... Skipping"
         return 1
     fi
+
+    if ! command -v mkfs.erofs &> /dev/null; then
+        echo "Test needs mkfs.erofs... Skipping"
+        return 1
+    fi
+
 }
 
 client_run() {
@@ -70,10 +76,7 @@ test_run() {
     client_run "live" "rd.live.image"
     client_run "livedir" "rd.live.image rd.live.dir=LiveOS"
 
-    # Run the erofs test only if mkfs.erofs is available
-    if command -v mkfs.erofs &> /dev/null; then
-        client_run "erofs" "root=live:/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs"
-    fi
+    client_run "erofs" "root=live:/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs"
 
     # Run the iso test only if xorriso is available
     if command -v xorriso &> /dev/null; then
@@ -119,10 +122,7 @@ EOF
     # erofs drive
     qemu_add_drive disk_args "$TESTDIR"/root_erofs.img root_erofs 1
 
-    # Write the erofs compressed filesystem to the partition
-    if command -v mkfs.erofs &> /dev/null; then
-        mkfs.erofs "$TESTDIR"/root_erofs.img "$TESTDIR"/rootfs/
-    fi
+    mkfs.erofs "$TESTDIR"/root_erofs.img "$TESTDIR"/rootfs/
 
     # iso drive
     qemu_add_drive disk_args "$TESTDIR"/root_iso.img root_iso 1

From b4679c201af880ac1b63cd63060e19b7ab4ed57d Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Thu, 29 Jan 2026 23:23:34 +0100
Subject: [PATCH 2/2] test: always test xorriso

---
 test/TEST-30-DMSQUASH/test.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index 2db7f88463..337f83447e 100755
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -20,6 +20,10 @@ test_check() {
         return 1
     fi
 
+    if ! command -v xorriso &> /dev/null; then
+        echo "Test needs xorriso... Skipping"
+        return 1
+    fi
 }
 
 client_run() {
@@ -78,10 +82,7 @@ test_run() {
 
     client_run "erofs" "root=live:/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root_erofs"
 
-    # Run the iso test only if xorriso is available
-    if command -v xorriso &> /dev/null; then
-        client_run "iso" "iso-scan/filename=linux.iso root=live:/dev/disk/by-label/ISO rd.driver.pre=squashfs rd.driver.pre=ext4"
-    fi
+    client_run "iso" "iso-scan/filename=linux.iso root=live:/dev/disk/by-label/ISO rd.driver.pre=squashfs rd.driver.pre=ext4"
 
     reset_overlay_partition
     client_run "autooverlay" "rd.live.image rd.overlay=LABEL=persist rd.live.dir=LiveOS"
@@ -128,11 +129,9 @@ EOF
     qemu_add_drive disk_args "$TESTDIR"/root_iso.img root_iso 1
 
     # Write the iso to the partition
-    if command -v xorriso &> /dev/null; then
-        mkdir "$TESTDIR"/iso
-        xorriso -as mkisofs -output "$TESTDIR"/iso/linux.iso "$TESTDIR"/live/ -volid "ISO" -iso-level 3
-        mkfs.ext4 -q -L dracut_iso -d "$TESTDIR"/iso/ "$TESTDIR"/root_iso.img
-    fi
+    mkdir "$TESTDIR"/iso
+    xorriso -as mkisofs -output "$TESTDIR"/iso/linux.iso "$TESTDIR"/live/ -volid "ISO" -iso-level 3
+    mkfs.ext4 -q -L dracut_iso -d "$TESTDIR"/iso/ "$TESTDIR"/root_iso.img
 
     local dracut_modules="dmsquash-live-autooverlay convertfs pollcdrom kernel-modules kernel-modules-extra qemu"