tests: use long options globally in test scripts

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/ts/blkid/cache b/tests/ts/blkid/cache
index d4b3720c96320ea83911d130a8ba7d2ff1ecd1d5..2c5e59ec8e3dbd6df8d8998b70dbf41ca128ccf1 100755 (executable)
--- 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 27a074b22006d115f95e9aea4ea2bcd0ad671693..ee6ba7d264a9c866ba34bd2eb9bf05175a714b28 100755 (executable)
--- 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 0c957abbf7dba0fc9ec5ba738c9c33645d878ad9..660b53e1181e3f3551050ca5873d0ed599ec0868 100755 (executable)
--- 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 b0ef82295e7887fcb5314c4a4070a1c9d34705c4..45888b886e54f557b492a871568a7bbbeb90e4d1 100755 (executable)
--- 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 1199fab4fe889975749c49b54a34bbde86d32438..dc6949141c747583cd096acf4ad9ecc0f002ee2d 100755 (executable)
--- 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 1b81ecf865e708f86134c3077a3c384002e1e9ef..b043c8177cd6da0590e5157fc53bd862e0d46aa9 100755 (executable)
--- 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 62eed5b4a6334f92e669d71f98219e0955da32ff..f0cd59ecf2f52cf535ee003ae9c82d3f34821289 100755 (executable)
--- 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 96da748c622d5800d489dae3eb5708544011dd9d..f4286fd4eb568326d36d7f97942aa38b5c57f2bf 100755 (executable)
--- 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 ac7ce012a02f6279eb342e2dbc497eb360b80136..90e4858ea0a741fff7dc32f70ced9aa0de8a95b2 100755 (executable)
--- 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 8477f929e9ca7695132c5ae66493dd908f81b9e6..54bbb9191a9ed05399dff50614f50a6ec01c87f1 100755 (executable)
--- 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 58208b9608e1960ded433a4f7eda1a9d07854417..e3049660f4e901492730489e662f965d4e2938ec 100755 (executable)
--- 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 c158f0c5d068b3d43e335f5010e6b87c6fa5b362..c36a508468e16e11b1f2ef5a3fa03cebe9e5bef5 100755 (executable)
--- 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 beccee4c9a9fa3de374bb0559ee5bb2b5d08abdf..900aa17f845cad135c613b369d0437aaba3793ee 100755 (executable)
--- 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 d17c82a30fb4e952e34ab02ecb6324e3d1f738a6..244d4d0f1e3374a492761e9323cdac542b01b827 100644 (file)
--- 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 6df9579b54a0158a6696f8ea19e18b14d06f4b35..ab1f72cc0a269baff1348efbcb4e48a27c889405 100755 (executable)
--- 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 90bb63a2c06a7bf1c88cfd8947f68b512a597f5c..ab35d8b8ba0190a258fe9d97a87d071280acc151 100755 (executable)
--- 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 ecebc158a859b59d444e510f6ecccd004d1bbffc..647eabcab0bc6fcd60606b6ed59bf1fea91a556b 100755 (executable)
--- 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 6e777ac2a970e84f677a10e082037a43b347c39c..6bcc12ab1435e111fda6731b529860deffd60e69 100755 (executable)
--- 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 0cff511f3a1ab2124d3d63d08b471a73634b257e..108d1309d104ea7b09cfc0f363de75d6596f8085 100755 (executable)
--- 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 <<EOF
  2048 6144 L
@@ -66,7 +66,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "read-dump-case"
-$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 <<EOF
 unit: sectors
@@ -80,7 +80,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "read-dump"
-$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 <<EOF
 unit: sectors
@@ -115,7 +115,7 @@ ts_finalize_subtest
 # logical partitions (just only one sector for EBR).
 #
 ts_init_subtest "explicit-size"
-$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 <<EOF
 label: dos
@@ -133,7 +133,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "resize"
-$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
 $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 <<EOF
 label: dos
@@ -147,7 +147,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "resize-empty-extended"
-$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
 $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 <<EOF
 label: dos
@@ -162,7 +162,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "reduce-empty-extended"
-$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
 $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 <<EOF
 label: dos
@@ -176,7 +176,7 @@ udevadm settle
 ts_finalize_subtest
 
 ts_init_subtest "resize-extended"
-$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
 $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 <<EOF
 label: dos
@@ -195,7 +195,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "resize-logical"
-$TS_CMD_WIPEFS -a ${TS_DEVICE} &> /dev/null
+$TS_CMD_WIPEFS --all ${TS_DEVICE} &> /dev/null
 udevadm settle
 $TS_CMD_SFDISK ${TS_DEVICE} > /dev/null 2>&1 <<EOF
 label: dos
@@ -214,7 +214,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "dump-old"
-$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-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 <<EOF
 3MiB 5MiB L
@@ -246,7 +246,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "default-vs-gap2"
-$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 <<EOF
 4MiB 3MiB L
@@ -261,7 +261,7 @@ ts_finalize_subtest
 
 
 ts_init_subtest "sizes-vs-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_OUTPUT 2>> $TS_ERRLOG <<EOF
 2048 1023 L -

diff --git a/tests/ts/ul/ul b/tests/ts/ul/ul
index 7ba72a9b122cc2e3b0313c71f1caea52d2d0010f..92118de1b5a26171903e495cf2665384126e56d2 100755 (executable)
--- a/tests/ts/ul/ul
+++ b/tests/ts/ul/ul
@@ -24,6 +24,6 @@ ts_check_test_command "$TS_CMD_UL"
 TS_KNOWN_FAIL="yes"
 
 printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" |
-       $TS_CMD_UL -t xterm >> $TS_OUTPUT 2>> $TS_ERRLOG
+       $TS_CMD_UL --terminal xterm >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_finalize