Skip to content

Commit

Permalink
extfs: add test data for the iso9660 extfs helper (xorriso part)
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
  • Loading branch information
@slowpeek @aborodin
slowpeek authored and aborodin committed May 18, 2024
1 parent 094a140 commit 62915a3
Show file tree
Hide file tree
Showing 5 changed files with 123 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tests/src/vfs/extfs/helpers-list/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ data_files_to_distribute = \
data/hp48+.args \
data/hp48+.input \
data/hp48+.output \
data/iso9660.xorriso.env_vars \
data/iso9660.xorriso.input \
data/iso9660.xorriso.output \
data/iso9660.xorriso.README \
data/lslR.1.spaces.args \
data/lslR.1.spaces.input \
data/lslR.1.spaces.output \
Expand Down
49 changes: 49 additions & 0 deletions tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.README
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Sample iso image was created from alpine-standard-3.19.0-x86_64.iso with such
script:

#!/usr/bin/env bash

if ! test -d links; then
mkdir "$_"
cd "$_"

touch no-quotes "inner'quote" "'side-quotes'"

ln -s no-quotes no-quotes-link
ln -s no-quotes "inner'quote-link-nq"
ln -s no-quotes "'side-quotes-link-nq'"
ln -s "inner'quote" "inner'quote-link-iq"
ln -s "inner'quote" "'side-quotes-link-iq'"
ln -s "'side-quotes'" "inner'quote-link-sq"
ln -s "'side-quotes'" "'side-quotes-link-sq'"

cd -
fi

args=(
-indev alpine-standard-3.19.0-x86_64.iso
-outdev sample.iso
-boot_image any replay
-joliet on
-rm_r /apks --
-cpr links / --
-chown_r 0 /links --
-chgrp_r 0 /links --
)

xorriso "${args[@]}"

Features:
- boot catalog file
- subdirs
- files with q(') included
- links with q(') included (name, target, both)

The quoted stuff is here because xorriso wraps pathes in single quotes and
escapes internal quotes, all with misc_funct.c:Text_shellsafe(). We revert it
back in the helper code.


Sample input was generated like this:

xorriso -dev sample.iso -find / -exec lsdl 2>/dev/null
1 change: 1 addition & 0 deletions tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.env_vars
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MC_TEST_EXTFS_ISO9660_TOOL=xorriso
35 changes: 35 additions & 0 deletions tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.input
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/'
-r--r--r-- 1 0 0 30 Dec 7 11:48 '/.alpine-release'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/boot'
-r--r--r-- 1 0 0 5751847 Dec 7 11:48 '/boot/System.map-lts'
-r--r--r-- 1 0 0 261013 Dec 7 11:48 '/boot/config-lts'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/boot/dtbs-lts'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/boot/grub'
-r--r--r-- 1 0 0 1474560 Dec 4 23:01 '/boot/grub/efi.img'
-r--r--r-- 1 0 0 140 Dec 7 11:48 '/boot/grub/grub.cfg'
-r--r--r-- 1 0 0 20486095 Dec 7 11:48 '/boot/initramfs-lts'
-r--r--r-- 1 0 0 160346112 Dec 7 11:48 '/boot/modloop-lts'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/boot/syslinux'
er--r--r-- 1 0 0 2048 Dec 4 23:01 '/boot/syslinux/boot.cat'
-r--r--r-- 1 0 0 432 May 16 2023 '/boot/syslinux/isohdpfx.bin'
-r--r--r-- 1 0 0 43008 May 16 2023 '/boot/syslinux/isolinux.bin'
-r--r--r-- 1 0 0 115468 May 16 2023 '/boot/syslinux/ldlinux.c32'
-r--r--r-- 1 0 0 178532 May 16 2023 '/boot/syslinux/libcom32.c32'
-r--r--r-- 1 0 0 23636 May 16 2023 '/boot/syslinux/libutil.c32'
-r--r--r-- 1 0 0 11712 May 16 2023 '/boot/syslinux/mboot.c32'
-r--r--r-- 1 0 0 193 Dec 7 11:48 '/boot/syslinux/syslinux.cfg'
-r--r--r-- 1 0 0 11879168 Dec 7 11:48 '/boot/vmlinuz-lts'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/efi'
dr-xr-xr-x 1 0 0 0 Dec 7 11:48 '/efi/boot'
-r--r--r-- 1 0 0 688128 Dec 7 11:48 '/efi/boot/bootx64.efi'
drwxr-xr-x 1 0 0 0 May 7 01:28 '/links'
-rw-r--r-- 1 0 0 0 May 7 01:28 '/links/'"'"'side-quotes'"'"''
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/'"'"'side-quotes-link-iq'"'"'' -> 'inner'"'"'quote'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/'"'"'side-quotes-link-nq'"'"'' -> 'no-quotes'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/'"'"'side-quotes-link-sq'"'"'' -> ''"'"'side-quotes'"'"''
-rw-r--r-- 1 0 0 0 May 7 01:28 '/links/inner'"'"'quote'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/inner'"'"'quote-link-iq' -> 'inner'"'"'quote'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/inner'"'"'quote-link-nq' -> 'no-quotes'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/inner'"'"'quote-link-sq' -> ''"'"'side-quotes'"'"''
-rw-r--r-- 1 0 0 0 May 7 01:28 '/links/no-quotes'
lrwxrwxrwx 1 0 0 0 May 7 01:28 '/links/no-quotes-link' -> 'no-quotes'
34 changes: 34 additions & 0 deletions tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.output
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
-r--r--r-- 1 0 0 30 2023-12-07 11:48:00 /.alpine-release
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /boot
-r--r--r-- 1 0 0 5751847 2023-12-07 11:48:00 /boot/System.map-lts
-r--r--r-- 1 0 0 261013 2023-12-07 11:48:00 /boot/config-lts
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /boot/dtbs-lts
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /boot/grub
-r--r--r-- 1 0 0 1474560 2023-12-04 23:01:00 /boot/grub/efi.img
-r--r--r-- 1 0 0 140 2023-12-07 11:48:00 /boot/grub/grub.cfg
-r--r--r-- 1 0 0 20486095 2023-12-07 11:48:00 /boot/initramfs-lts
-r--r--r-- 1 0 0 160346112 2023-12-07 11:48:00 /boot/modloop-lts
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /boot/syslinux
-r--r--r-- 1 0 0 2048 2023-12-04 23:01:00 /boot/syslinux/boot.cat
-r--r--r-- 1 0 0 432 2023-05-16 00:00:00 /boot/syslinux/isohdpfx.bin
-r--r--r-- 1 0 0 43008 2023-05-16 00:00:00 /boot/syslinux/isolinux.bin
-r--r--r-- 1 0 0 115468 2023-05-16 00:00:00 /boot/syslinux/ldlinux.c32
-r--r--r-- 1 0 0 178532 2023-05-16 00:00:00 /boot/syslinux/libcom32.c32
-r--r--r-- 1 0 0 23636 2023-05-16 00:00:00 /boot/syslinux/libutil.c32
-r--r--r-- 1 0 0 11712 2023-05-16 00:00:00 /boot/syslinux/mboot.c32
-r--r--r-- 1 0 0 193 2023-12-07 11:48:00 /boot/syslinux/syslinux.cfg
-r--r--r-- 1 0 0 11879168 2023-12-07 11:48:00 /boot/vmlinuz-lts
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /efi
dr-xr-xr-x 1 0 0 0 2023-12-07 11:48:00 /efi/boot
-r--r--r-- 1 0 0 688128 2023-12-07 11:48:00 /efi/boot/bootx64.efi
drwxr-xr-x 1 0 0 0 2024-05-07 01:28:00 /links
-rw-r--r-- 1 0 0 0 2024-05-07 01:28:00 /links/'side-quotes'
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/'side-quotes-link-iq' -> inner'quote
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/'side-quotes-link-nq' -> no-quotes
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/'side-quotes-link-sq' -> 'side-quotes'
-rw-r--r-- 1 0 0 0 2024-05-07 01:28:00 /links/inner'quote
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/inner'quote-link-iq -> inner'quote
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/inner'quote-link-nq -> no-quotes
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/inner'quote-link-sq -> 'side-quotes'
-rw-r--r-- 1 0 0 0 2024-05-07 01:28:00 /links/no-quotes
lrwxrwxrwx 1 0 0 0 2024-05-07 01:28:00 /links/no-quotes-link -> no-quotes

0 comments on commit 62915a3

Please sign in to comment.