From 5bcddb87b6d792c177f6ca105a944f5a71bec7a7 Mon Sep 17 00:00:00 2001 From: Christian Goeschel Ndjomouo Date: Thu, 29 Jan 2026 00:03:29 -0500 Subject: [PATCH] tests: use long options globally in test scripts Signed-off-by: Christian Goeschel Ndjomouo --- tests/ts/blkid/cache | 4 ++-- tests/ts/blkid/low-probe | 5 ++--- tests/ts/blkid/md-raid0-whole | 4 ++-- tests/ts/blkid/md-raid1-part | 6 ++--- tests/ts/blkid/md-raid1-whole | 4 ++-- tests/ts/blkid/offset | 2 +- tests/ts/blkid/topology | 4 ++-- tests/ts/cal/colorw | 12 +++++----- tests/ts/fadvise/drop | 10 ++++----- tests/ts/fdisk/bsd | 16 +++++++------- tests/ts/findmnt/df-options | 4 ++-- tests/ts/ipcs/mk-rm-msg | 4 ++-- tests/ts/ipcs/mk-rm-sem | 16 +++++++------- tests/ts/losetup/losetup_functions.sh | 6 ++--- tests/ts/lsfd/mkfds-mapped-packet-socket | 2 +- tests/ts/lslocks/filter | 6 ++--- tests/ts/misc/fallocate | 2 +- tests/ts/misc/swaplabel | 4 ++-- tests/ts/sfdisk/dos | 28 ++++++++++++------------ tests/ts/ul/ul | 2 +- 20 files changed, 70 insertions(+), 71 deletions(-) diff --git a/tests/ts/blkid/cache b/tests/ts/blkid/cache index d4b3720c9..2c5e59ec8 100755 --- a/tests/ts/blkid/cache +++ b/tests/ts/blkid/cache @@ -30,8 +30,8 @@ ts_check_losetup ts_device_init -"$TS_CMD_MKSWAP" --quiet --pagesize 4096 --endianness little --uuid \ - 11111111-1111-1111-1111-111111111111 \ +"$TS_CMD_MKSWAP" --quiet --pagesize 4096 --endianness little \ + --uuid 11111111-1111-1111-1111-111111111111 \ "$TS_LODEV" \ >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" diff --git a/tests/ts/blkid/low-probe b/tests/ts/blkid/low-probe index 27a074b22..ee6ba7d26 100755 --- a/tests/ts/blkid/low-probe +++ b/tests/ts/blkid/low-probe @@ -47,8 +47,7 @@ for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do | sed 's/-$//g') for off in $sessions; do ts_init_subtest $name-$off - $TS_CMD_BLKID -p -o udev $outimg \ - --hint session_offset=$(( $off * 2048 )) \ + $TS_CMD_BLKID --probe --output udev $outimg --hint session_offset=$(( $off * 2048 )) \ 2> $TS_ERRLOG | sort > $TS_OUTPUT ts_finalize_subtest done @@ -57,7 +56,7 @@ for img in $(ls $TS_SELF/images-fs/*.img.xz | sort); do # else ts_init_subtest $name - $TS_CMD_BLKID -p -o udev $outimg 2> $TS_ERRLOG | sort > $TS_OUTPUT + $TS_CMD_BLKID --probe --output udev $outimg 2> $TS_ERRLOG | sort > $TS_OUTPUT ts_finalize_subtest fi done diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole index 0c957abbf..660b53e11 100755 --- a/tests/ts/blkid/md-raid0-whole +++ b/tests/ts/blkid/md-raid0-whole @@ -78,10 +78,10 @@ EOF udevadm settle ts_log "Probe first RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Stop RAID device" mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index b0ef82295..45888b886 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -75,13 +75,13 @@ mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \ udevadm settle ts_log "Probe whole-disk" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE} 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev ${TS_DEVICE} 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe first RAID member" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev ${TS_DEVICE}2 2>> $TS_ERRLOG | sort >> $TS_OUTPUT mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 1199fab4f..dc6949141 100755 --- a/tests/ts/blkid/md-raid1-whole +++ b/tests/ts/blkid/md-raid1-whole @@ -81,10 +81,10 @@ EOF udevadm settle ts_log "Probe first RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Probe second RAID member" -$TS_CMD_BLKID -p -o udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT +$TS_CMD_BLKID --probe --output udev $DEVICE1 2>> $TS_ERRLOG | sort >> $TS_OUTPUT ts_log "Stop RAID device" mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/tests/ts/blkid/offset b/tests/ts/blkid/offset index 1b81ecf86..b043c8177 100755 --- a/tests/ts/blkid/offset +++ b/tests/ts/blkid/offset @@ -52,7 +52,7 @@ size=$(( $(cat /sys/block/${DEVNAME}/${DEVNAME}2/size) * 512)) $TS_CMD_PARTX --delete ${TS_DEVICE} &> /dev/null -$TS_CMD_BLKID -p -o udev --offset=${offset} --size=${size} $TS_DEVICE \ +$TS_CMD_BLKID --probe --output udev --offset=${offset} --size=${size} $TS_DEVICE \ >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize diff --git a/tests/ts/blkid/topology b/tests/ts/blkid/topology index 62eed5b4a..f0cd59ecf 100755 --- a/tests/ts/blkid/topology +++ b/tests/ts/blkid/topology @@ -34,7 +34,7 @@ ts_device_init ts_init_subtest disk echo -e 'label: dos\n- - - -' | "$TS_CMD_SFDISK" -q "$TS_LODEV" -"$TS_CMD_BLKID" --info -o udev "$TS_LODEV" \ +"$TS_CMD_BLKID" --info --output udev "$TS_LODEV" \ 2> "$TS_ERRLOG" \ | sed -E -e 's/^ID_FS_DISKSEQ=[[:digit:]]+$/ID_FS_DISKSEQ=S/' \ | sort > "$TS_OUTPUT" @@ -44,7 +44,7 @@ ts_finalize_subtest ts_init_subtest partition -"$TS_CMD_BLKID" -i -o udev "$TS_LODEV"p1 \ +"$TS_CMD_BLKID" --info --output udev "$TS_LODEV"p1 \ 2> "$TS_ERRLOG" \ | sed -E -e 's/^ID_FS_DISKSEQ=[[:digit:]]+$/ID_FS_DISKSEQ=S/' \ | sort > "$TS_OUTPUT" diff --git a/tests/ts/cal/colorw b/tests/ts/cal/colorw index 96da748c6..f4286fd4e 100755 --- a/tests/ts/cal/colorw +++ b/tests/ts/cal/colorw @@ -40,27 +40,27 @@ function call_cal { } ts_init_subtest "first-day-week-numbers" -call_cal -w --color=always 1 1 1 +call_cal --week --color=always 1 1 1 ts_finalize_subtest ts_init_subtest "reformation-corner-cases-1-week-numbers" -call_cal -w --color=always 2 9 1752 +call_cal --week --color=always 2 9 1752 ts_finalize_subtest ts_init_subtest "reformation-corner-cases-2-week-numbers" -call_cal -w --color=always 3 9 1752 +call_cal --week --color=always 3 9 1752 ts_finalize_subtest ts_init_subtest "reformation-corner-cases-3-week-numbers" -call_cal -w --color=always 13 9 1752 +call_cal --week --color=always 13 9 1752 ts_finalize_subtest ts_init_subtest "reformation-corner-cases-4-week-numbers" -call_cal -w --color=always 14 9 1752 +call_cal --week --color=always 14 9 1752 ts_finalize_subtest ts_init_subtest "last-day-week-numbers" -call_cal -w --color=always -3 31 12 9999 +call_cal --week --color=always -3 31 12 9999 ts_finalize_subtest ts_finalize diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop index ac7ce012a..90e4858ea 100755 --- a/tests/ts/fadvise/drop +++ b/tests/ts/fadvise/drop @@ -19,7 +19,7 @@ FILE="ddtest" BS=65536 COUNT=8 -FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" +FS="$("$TS_CMD_FINDMNT" --noheadings --raw --output FSTYPE --target "$PWD")" if [[ "$FS" = "tmpfs" || "$FS" = "overlay" || "$FS" = "" ]]; then ts_skip "fincore does not work on tmpfs or unknown fs" fi @@ -29,7 +29,7 @@ create_file() { } do_fincore() { - "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" + "$TS_CMD_FINCORE" --output RES,SIZE,FILE "$FILE" } { @@ -46,21 +46,21 @@ do_fincore() { create_file echo "offset: $(( 2 * $BS ))" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" + "$TS_CMD_FADVISE" --offset $(( 2 * $BS )) "$FILE" echo status: $? do_fincore echo create_file echo "length: $(( 4 * $BS ))" - "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" + "$TS_CMD_FADVISE" --length $(( 4 * $BS )) "$FILE" echo status: $? do_fincore echo create_file echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" + "$TS_CMD_FADVISE" --offset $(( 2 * $BS )) --length $(( 4 * $BS )) --fd 42 42<"$FILE" echo status: $? do_fincore echo diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd index 8477f929e..54bbb9191 100755 --- a/tests/ts/fdisk/bsd +++ b/tests/ts/fdisk/bsd @@ -76,7 +76,7 @@ TS_EXPECTED+="_${BSD_LABELSECTOR}_${BSD_LABELOFFSET}${BSD_EXTRA}.${BYTE_ORDER}" function print_layout { echo -ne "\n---layout----------\n" >> $TS_OUTPUT - $TS_CMD_FDISK -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT + $TS_CMD_FDISK --list-details ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } @@ -89,38 +89,38 @@ function print_bsd_layout { ts_log "Initialize empty image" TEST_IMAGE_NAME=$(ts_image_init 10) -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Create new DOS partition table" echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_SETID}${FDISK_CMD_WRITE_CLOSE}" \ | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create 1st primary partition" echo -e "${FDISK_CMD_CREATE_PRIMARY1}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create 2nd primary partition" echo -e "${FDISK_CMD_CREATE_PRIMARY2}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG ts_log "Set 2nd partition type" echo -e "${FDISK_CMD_CHANGE_PART2TYPE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_layout ts_log "Create default BSD" echo -e "${FDISK_CMD_BSD_CREATE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_bsd_layout @@ -129,7 +129,7 @@ echo -e "${FDISK_CMD_BSD_CREATE_PART}${FDISK_CMD_WRITE_CLOSE}" | \ echo -e "${FDISK_CMD_BSD_PARTTYPE}${FDISK_CMD_WRITE_CLOSE}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null -$TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_HEXDUMP --canonical ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG print_bsd_layout diff --git a/tests/ts/findmnt/df-options b/tests/ts/findmnt/df-options index 58208b960..e3049660f 100755 --- a/tests/ts/findmnt/df-options +++ b/tests/ts/findmnt/df-options @@ -26,7 +26,7 @@ ts_cd "$TS_OUTDIR" D_expectation="SOURCE FSTYPE SIZE USED AVAIL USE% TARGET" I_expectation="SOURCE FSTYPE INO.TOTAL INO.USED INO.AVAIL INO.USE% TARGET" { - if [[ $($TS_CMD_FINDMNT --raw -D | head -1) == "$D_expectation" ]]; then + if [[ $($TS_CMD_FINDMNT --raw --df | head -1) == "$D_expectation" ]]; then echo "-D: OK" else echo "-D: ERROR" @@ -34,7 +34,7 @@ I_expectation="SOURCE FSTYPE INO.TOTAL INO.USED INO.AVAIL INO.USE% TARGET" echo $? fi - if [[ $($TS_CMD_FINDMNT --raw -I | head -1) == "$I_expectation" ]]; then + if [[ $($TS_CMD_FINDMNT --raw --dfi | head -1) == "$I_expectation" ]]; then echo "-I: OK" else echo "-I: ERROR" diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg index c158f0c5d..c36a50846 100755 --- a/tests/ts/ipcs/mk-rm-msg +++ b/tests/ts/ipcs/mk-rm-msg @@ -26,8 +26,8 @@ ts_check_test_command "$TS_HELPER_SYSINFO" . "$TS_SELF"/functions.sh rm -f $TS_OUTDIR/id-msg -$TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg -$TS_CMD_IPCS -q -i "$(cat $TS_OUTDIR/id-msg)" |\ +$TS_CMD_IPCMK --queue 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg +$TS_CMD_IPCS --queues --id "$(cat $TS_OUTDIR/id-msg)" |\ grep -c "^Message Queue msqid=$(cat $TS_OUTDIR/id-msg)$" >>$TS_OUTPUT $TS_CMD_IPCRM -q "$(cat $TS_OUTDIR/id-msg)" >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem index beccee4c9..900aa17f8 100755 --- a/tests/ts/ipcs/mk-rm-sem +++ b/tests/ts/ipcs/mk-rm-sem @@ -26,16 +26,16 @@ ts_check_test_command "$TS_HELPER_SYSINFO" . "$TS_SELF"/functions.sh rm -f $TS_OUTDIR/id-sem -$TS_CMD_IPCMK -S 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem -$TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT -$TS_CMD_IPCRM -s $(cat $TS_OUTDIR/id-sem) >> $TS_OUTPUT 2>> $TS_ERRLOG +$TS_CMD_IPCMK --semaphore 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem +$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT +$TS_CMD_IPCRM -s "$(cat $TS_OUTDIR/id-sem)" >> $TS_OUTPUT 2>> $TS_ERRLOG rm -f $TS_OUTDIR/id-sem -$TS_CMD_IPCMK -S 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem -$TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT -$TS_CMD_IPCRM -S "$( - $TS_CMD_IPCS -s | - awk -v id=$(cat $TS_OUTDIR/id-sem) '{if ($2 == id){print $1}}' | +$TS_CMD_IPCMK --semaphore 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem +$TS_CMD_IPCS --semaphores --id "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT +$TS_CMD_IPCRM --semaphore-key "$( + $TS_CMD_IPCS --semaphores | + awk -v id="$(cat $TS_OUTDIR/id-sem)" '{if ($2 == id){print $1}}' | uniq )" >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/tests/ts/losetup/losetup_functions.sh b/tests/ts/losetup/losetup_functions.sh index d17c82a30..244d4d0f1 100644 --- a/tests/ts/losetup/losetup_functions.sh +++ b/tests/ts/losetup/losetup_functions.sh @@ -1,7 +1,7 @@ function lo_print { local lo=$1 - echo "offset: $( $TS_CMD_LOSETUP --list --raw -n -O OFFSET $lo )" - echo "sizelimit: $( $TS_CMD_LOSETUP --list --raw -n -O SIZELIMIT $lo )" - echo "size: $( $TS_CMD_LSBLK -o SIZE -b -n -r $lo )" + echo "offset: $( $TS_CMD_LOSETUP --list --raw --noheadings --output OFFSET $lo )" + echo "sizelimit: $( $TS_CMD_LOSETUP --list --raw --noheadings --output SIZELIMIT $lo )" + echo "size: $( $TS_CMD_LSBLK --output SIZE --bytes --noheadings --raw $lo )" } diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket index 6df9579b5..ab1f72cc0 100755 --- a/tests/ts/lsfd/mkfds-mapped-packet-socket +++ b/tests/ts/lsfd/mkfds-mapped-packet-socket @@ -43,7 +43,7 @@ for PROTOCOL in $(printf "%d" 0x10) 10000; do interface=${INTERFACE} socktype=${SOCKTYPE} protocol=${PROTOCOL}; } if read -u ${MKFDS[0]} PID; then EXPR='(ASSOC == "shm") and (STTYPE == "SOCK") and (MODE == "-w-")' - ${TS_CMD_LSFD} -p "$PID" -n -o SOCK.PROTONAME -Q "${EXPR}" + ${TS_CMD_LSFD} --pid "$PID" --noheadings --output SOCK.PROTONAME --filter "${EXPR}" echo 'SOCK.PROTONAME': $? EXPR="(FD == $FD)" diff --git a/tests/ts/lslocks/filter b/tests/ts/lslocks/filter index 90bb63a2c..ab35d8b8b 100755 --- a/tests/ts/lslocks/filter +++ b/tests/ts/lslocks/filter @@ -55,9 +55,9 @@ do_lslocks_flock_crash() echo "#### crash when printing PID column ####" [[ "$pid" == $("$TS_CMD_LSLOCKS" \ - -r -n -p "$PID" \ - -Q 'PATH =~ '"'.*/$FILE'"" and TYPE == 'FLOCK'" \ - -o PID) ]] + --raw --noheadings --pid "$PID" \ + --filter 'PATH =~ '"'.*/$FILE'"" and TYPE == 'FLOCK'" \ + --output PID) ]] echo "PID: $?" } diff --git a/tests/ts/misc/fallocate b/tests/ts/misc/fallocate index ecebc158a..647eabcab 100755 --- a/tests/ts/misc/fallocate +++ b/tests/ts/misc/fallocate @@ -33,7 +33,7 @@ if $TS_CMD_FALLOCATE --offset 128 --length 256 $IMAGE >> $TS_OUTPUT 2>> $TS_ERRL stat -c "%s" $IMAGE >> $TS_OUTPUT 2>> $TS_ERRLOG else # fs type of $TS_OUTDIR, could be used to skip this test early - fs_type=$(${TS_CMD_FINDMNT} -n -o FSTYPE -T ${TS_OUTDIR}) + fs_type=$(${TS_CMD_FINDMNT} --noheadings --output FSTYPE --target ${TS_OUTDIR}) grep -qi "fallocate: fallocate failed:.*not supported" $TS_ERRLOG \ && ts_skip "'${fs_type}' not supported" diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 6e777ac2a..6bcc12ab1 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -31,7 +31,7 @@ MIN_SWAP_SIZE=$(( 10 * $PAGE_SIZE )) MIN_SWAP_SIZE_KB=$(( MIN_SWAP_SIZE / 1024 )) rm -f $IMAGE -$TS_CMD_FALLOCATE -x -l $(( $MIN_SWAP_SIZE - 1 )) $IMAGE 2> /dev/null +$TS_CMD_FALLOCATE --posix --length $(( $MIN_SWAP_SIZE - 1 )) $IMAGE 2> /dev/null $TS_CMD_MKSWAP \ --label 1234567890abcdef \ --uuid 12345678-abcd-abcd-abcd-1234567890ab \ @@ -43,7 +43,7 @@ sed -i -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \ $TS_OUTPUT $TS_ERRLOG rm -f $IMAGE -$TS_CMD_FALLOCATE -x -l $MIN_SWAP_SIZE $IMAGE 2> /dev/null +$TS_CMD_FALLOCATE --posix --length $MIN_SWAP_SIZE $IMAGE 2> /dev/null $TS_CMD_MKSWAP \ --label 1234567890abcdef \ --uuid 12345678-abcd-abcd-abcd-1234567890ab \ diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos index 0cff511f3..108d1309d 100755 --- a/tests/ts/sfdisk/dos +++ b/tests/ts/sfdisk/dos @@ -53,7 +53,7 @@ ts_finalize_subtest ts_init_subtest "simple-space" -$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK --unit S ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-old >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle @@ -224,7 +224,7 @@ ts_finalize_subtest ts_init_subtest "dump-gaps" -$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} < $TS_SELF/files/dump-gaps >> $TS_OUTPUT 2>> $TS_ERRLOG udevadm settle @@ -234,7 +234,7 @@ ts_finalize_subtest ts_init_subtest "default-vs-gap1" -$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG < /dev/null +$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null udevadm settle $TS_CMD_SFDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <> $TS_OUTPUT 2>> $TS_ERRLOG + $TS_CMD_UL --terminal xterm >> $TS_OUTPUT 2>> $TS_ERRLOG ts_finalize -- 2.47.3