Skip to content

test: always test erofs and xorriso #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bdrung wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

test: always test erofs and xorriso #2163

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ae73fc
test: always test erofs
bdrung Jan 29, 2026
b4679c2
test: always test xorriso
bdrung Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions test/TEST-30-DMSQUASH/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ 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

if ! command -v xorriso &> /dev/null; then
echo "Test needs xorriso... Skipping"
return 1
fi
}

client_run() {
Expand Down Expand Up @@ -70,15 +80,9 @@ 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
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"
Expand Down Expand Up @@ -119,20 +123,15 @@ 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

# 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"

Expand Down
Loading