diff --git a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.README b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.README index 138f047c5..e5ddb4a11 100644 --- a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.README +++ b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.README @@ -1,8 +1,16 @@ -Sample iso image was created from alpine-standard-3.19.0-x86_64.iso with such -script: +Regarding the date formats used in listings, xorriso [1] implements the same +behavior as `ls` [2]: 'month day year' for recent items (180 days old at max), +'month day time' for older ones. So, it is important to NOT have any "recent" +items in the input data for tests. Otherwise, after some time, the test would +fail, like it happened in ticket #4567. + +Sample iso image was created from alpine-standard-3.18.0-x86_64.iso (dated May +9, 2023) with such script: #!/usr/bin/env bash + EPOCH='Jan 1 2024' + if ! test -d links; then mkdir "$_" cd "$_" @@ -18,10 +26,12 @@ script: ln -s "'side-quotes'" "'side-quotes-link-sq'" cd - + + find links -exec touch -h -d "$EPOCH" {} + fi args=( - -indev alpine-standard-3.19.0-x86_64.iso + -indev alpine-standard-3.18.0-x86_64.iso -outdev sample.iso -boot_image any replay -joliet on @@ -47,3 +57,7 @@ back in the helper code. Sample input was generated like this: xorriso -dev sample.iso -find / -exec lsdl 2>/dev/null + + +[1] misc_funct.c:Ftimetxt() +[2] ls.c:long_time_format[] (in GNU coreutils) diff --git a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.input b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.input index 05548fc60..4a70f5ead 100644 --- a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.input +++ b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.input @@ -1,35 +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' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/' +-r--r--r-- 1 0 0 30 May 9 2023 '/.alpine-release' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/boot' +-r--r--r-- 1 0 0 3635088 May 9 2023 '/boot/System.map-lts' +-r--r--r-- 1 0 0 251348 May 9 2023 '/boot/config-lts' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/boot/dtbs-lts' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/boot/grub' +-r--r--r-- 1 0 0 1474560 May 8 2023 '/boot/grub/efi.img' +-r--r--r-- 1 0 0 140 May 9 2023 '/boot/grub/grub.cfg' +-r--r--r-- 1 0 0 19242262 May 9 2023 '/boot/initramfs-lts' +-r--r--r-- 1 0 0 145743872 May 9 2023 '/boot/modloop-lts' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/boot/syslinux' +er--r--r-- 1 0 0 2048 May 8 2023 '/boot/syslinux/boot.cat' +-r--r--r-- 1 0 0 432 Apr 11 2023 '/boot/syslinux/isohdpfx.bin' +-r--r--r-- 1 0 0 43008 Apr 11 2023 '/boot/syslinux/isolinux.bin' +-r--r--r-- 1 0 0 116144 Apr 11 2023 '/boot/syslinux/ldlinux.c32' +-r--r--r-- 1 0 0 179944 Apr 11 2023 '/boot/syslinux/libcom32.c32' +-r--r--r-- 1 0 0 24280 Apr 11 2023 '/boot/syslinux/libutil.c32' +-r--r--r-- 1 0 0 11712 Apr 11 2023 '/boot/syslinux/mboot.c32' +-r--r--r-- 1 0 0 193 May 9 2023 '/boot/syslinux/syslinux.cfg' +-r--r--r-- 1 0 0 10357760 May 9 2023 '/boot/vmlinuz-lts' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/efi' +dr-xr-xr-x 1 0 0 0 May 9 2023 '/efi/boot' +-r--r--r-- 1 0 0 692224 May 9 2023 '/efi/boot/bootx64.efi' +drwxr-xr-x 1 0 0 0 Jan 1 2024 '/links' +-rw-r--r-- 1 0 0 0 Jan 1 2024 '/links/'"'"'side-quotes'"'"'' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/'"'"'side-quotes-link-iq'"'"'' -> 'inner'"'"'quote' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/'"'"'side-quotes-link-nq'"'"'' -> 'no-quotes' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/'"'"'side-quotes-link-sq'"'"'' -> ''"'"'side-quotes'"'"'' +-rw-r--r-- 1 0 0 0 Jan 1 2024 '/links/inner'"'"'quote' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/inner'"'"'quote-link-iq' -> 'inner'"'"'quote' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/inner'"'"'quote-link-nq' -> 'no-quotes' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/inner'"'"'quote-link-sq' -> ''"'"'side-quotes'"'"'' +-rw-r--r-- 1 0 0 0 Jan 1 2024 '/links/no-quotes' +lrwxrwxrwx 1 0 0 0 Jan 1 2024 '/links/no-quotes-link' -> 'no-quotes' diff --git a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.output b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.output index 3e21c1430..282507d1a 100644 --- a/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.output +++ b/tests/src/vfs/extfs/helpers-list/data/iso9660.xorriso.output @@ -1,34 +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 +-r--r--r-- 1 0 0 30 2023-05-09 00:00:00 /.alpine-release +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /boot +-r--r--r-- 1 0 0 3635088 2023-05-09 00:00:00 /boot/System.map-lts +-r--r--r-- 1 0 0 251348 2023-05-09 00:00:00 /boot/config-lts +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /boot/dtbs-lts +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /boot/grub +-r--r--r-- 1 0 0 1474560 2023-05-08 00:00:00 /boot/grub/efi.img +-r--r--r-- 1 0 0 140 2023-05-09 00:00:00 /boot/grub/grub.cfg +-r--r--r-- 1 0 0 19242262 2023-05-09 00:00:00 /boot/initramfs-lts +-r--r--r-- 1 0 0 145743872 2023-05-09 00:00:00 /boot/modloop-lts +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /boot/syslinux +-r--r--r-- 1 0 0 2048 2023-05-08 00:00:00 /boot/syslinux/boot.cat +-r--r--r-- 1 0 0 432 2023-04-11 00:00:00 /boot/syslinux/isohdpfx.bin +-r--r--r-- 1 0 0 43008 2023-04-11 00:00:00 /boot/syslinux/isolinux.bin +-r--r--r-- 1 0 0 116144 2023-04-11 00:00:00 /boot/syslinux/ldlinux.c32 +-r--r--r-- 1 0 0 179944 2023-04-11 00:00:00 /boot/syslinux/libcom32.c32 +-r--r--r-- 1 0 0 24280 2023-04-11 00:00:00 /boot/syslinux/libutil.c32 +-r--r--r-- 1 0 0 11712 2023-04-11 00:00:00 /boot/syslinux/mboot.c32 +-r--r--r-- 1 0 0 193 2023-05-09 00:00:00 /boot/syslinux/syslinux.cfg +-r--r--r-- 1 0 0 10357760 2023-05-09 00:00:00 /boot/vmlinuz-lts +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /efi +dr-xr-xr-x 1 0 0 0 2023-05-09 00:00:00 /efi/boot +-r--r--r-- 1 0 0 692224 2023-05-09 00:00:00 /efi/boot/bootx64.efi +drwxr-xr-x 1 0 0 0 2024-01-01 00:00:00 /links +-rw-r--r-- 1 0 0 0 2024-01-01 00:00:00 /links/'side-quotes' +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/'side-quotes-link-iq' -> inner'quote +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/'side-quotes-link-nq' -> no-quotes +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/'side-quotes-link-sq' -> 'side-quotes' +-rw-r--r-- 1 0 0 0 2024-01-01 00:00:00 /links/inner'quote +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/inner'quote-link-iq -> inner'quote +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/inner'quote-link-nq -> no-quotes +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/inner'quote-link-sq -> 'side-quotes' +-rw-r--r-- 1 0 0 0 2024-01-01 00:00:00 /links/no-quotes +lrwxrwxrwx 1 0 0 0 2024-01-01 00:00:00 /links/no-quotes-link -> no-quotes