tests: (blkid) use more long options to improve test coverage accuracy

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

diff --git a/tests/ts/blkid/cache b/tests/ts/blkid/cache
index 3390d3daac04fa2826e7f97ee0742c5dc29328be..d4b3720c96320ea83911d130a8ba7d2ff1ecd1d5 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" -q -p 4096 -e little \
-       -U 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/dm-err b/tests/ts/blkid/dm-err
index a23b2e0515d77ba4c43bdcfcf4b34bc501e6a593..6da3525c1770d8e1dd1f535e76c752ef06553716 100755 (executable)
--- a/tests/ts/blkid/dm-err
+++ b/tests/ts/blkid/dm-err
@@ -41,7 +41,7 @@ if [ "$TRAVIS" == "true" ] && [ ! -b "$DEVICE" ]; then
 fi
 
 ts_log "Probe device"
-$TS_CMD_BLKID -p -o udev $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_BLKID --probe --output udev $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
 echo "Return code: $?" >> $TS_OUTPUT
 
 udevadm settle

diff --git a/tests/ts/blkid/topology b/tests/ts/blkid/topology
index fcf07247315ac8267e8b136be71b9645c7ddb133..62eed5b4a6334f92e669d71f98219e0955da32ff 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" -i -o udev "$TS_LODEV" \
+"$TS_CMD_BLKID" --info -o udev "$TS_LODEV" \
        2> "$TS_ERRLOG" \
        | sed -E -e 's/^ID_FS_DISKSEQ=[[:digit:]]+$/ID_FS_DISKSEQ=S/' \
        | sort > "$TS_OUTPUT"