From: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
Date: Thu, 23 Apr 2026 18:29:32 +0000 (-0400)
Subject: tests: (dmesg) use more long-opts to better track coverage
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cfe17b718408a0a224fa29142fdc74831275749b;p=thirdparty%2Futil-linux.git

tests: (dmesg) use more long-opts to better track coverage

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

diff --git a/tests/ts/dmesg/cid-json b/tests/ts/dmesg/cid-json
index d1318bf51..5cbfb5b42 100755
--- a/tests/ts/dmesg/cid-json
+++ b/tests/ts/dmesg/cid-json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -J -F $TS_SELF/cid-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --file $TS_SELF/cid-input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-colors b/tests/ts/dmesg/cid-kmsg-colors
index 267205104..71f1e4c8e 100755
--- a/tests/ts/dmesg/cid-kmsg-colors
+++ b/tests/ts/dmesg/cid-kmsg-colors
@@ -24,7 +24,7 @@ ts_inhibit_custom_colorscheme
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --color=always -K $TS_SELF/cid-kmsg-input -x >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --color=always --kmsg-file $TS_SELF/cid-kmsg-input --decode >> $TS_OUTPUT 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
diff --git a/tests/ts/dmesg/cid-kmsg-console-levels b/tests/ts/dmesg/cid-kmsg-console-levels
index 5bcf488c2..051927a39 100755
--- a/tests/ts/dmesg/cid-kmsg-console-levels
+++ b/tests/ts/dmesg/cid-kmsg-console-levels
@@ -25,21 +25,21 @@ export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..8}; do
         echo "Display console level: $I" >> $TS_OUTPUT
-	$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level $I >> $TS_OUTPUT 2>/dev/null
 done
 
 echo "Display console level: err+" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l err+ >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level err+ >> $TS_OUTPUT 2>/dev/null
 echo "Display console level: emerg+" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l emerg+ >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level emerg+ >> $TS_OUTPUT 2>/dev/null
 echo "Display console level: +err" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l +err >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level +err >> $TS_OUTPUT 2>/dev/null
 echo "Display console level: +debug" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l +debug >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level +debug >> $TS_OUTPUT 2>/dev/null
 echo "Display console level: debug" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l debug >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level debug >> $TS_OUTPUT 2>/dev/null
 echo "Display console level: + (invalid)" >> $TS_OUTPUT
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -l + 2>> $TS_OUTPUT >/dev/null
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --level + 2>> $TS_OUTPUT >/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
diff --git a/tests/ts/dmesg/cid-kmsg-decode b/tests/ts/dmesg/cid-kmsg-decode
index d4eb5c7f7..a1a767dbc 100755
--- a/tests/ts/dmesg/cid-kmsg-decode
+++ b/tests/ts/dmesg/cid-kmsg-decode
@@ -23,7 +23,7 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -x -K $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --decode --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
diff --git a/tests/ts/dmesg/cid-kmsg-delta b/tests/ts/dmesg/cid-kmsg-delta
index 65aaa6694..d5fc1e157 100755
--- a/tests/ts/dmesg/cid-kmsg-delta
+++ b/tests/ts/dmesg/cid-kmsg-delta
@@ -23,7 +23,7 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -d -K $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
 # normalize caller_id padding by removing leading spaces
diff --git a/tests/ts/dmesg/cid-kmsg-facilities b/tests/ts/dmesg/cid-kmsg-facilities
index cfd84a49b..38cac1704 100755
--- a/tests/ts/dmesg/cid-kmsg-facilities
+++ b/tests/ts/dmesg/cid-kmsg-facilities
@@ -25,7 +25,7 @@ export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..12}; do
         echo "Display facility list: $I" >> $TS_OUTPUT
-	$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-input -f $I -x >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-input --facility $I --decode >> $TS_OUTPUT 2>/dev/null
 done
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
diff --git a/tests/ts/dmesg/cid-kmsg-indentation b/tests/ts/dmesg/cid-kmsg-indentation
index 9cabc446e..76cbc6af0 100755
--- a/tests/ts/dmesg/cid-kmsg-indentation
+++ b/tests/ts/dmesg/cid-kmsg-indentation
@@ -23,9 +23,9 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_HELPER_DMESG -K $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 $TS_HELPER_DMESG --time-format=delta --kmsg-file $TS_SELF/cid-kmsg-newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
 
diff --git a/tests/ts/dmesg/cid-kmsg-json b/tests/ts/dmesg/cid-kmsg-json
index ce6382805..25ed8b5ba 100755
--- a/tests/ts/dmesg/cid-kmsg-json
+++ b/tests/ts/dmesg/cid-kmsg-json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -J -K $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --kmsg-file $TS_SELF/cid-kmsg-input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/cid-kmsg-limit b/tests/ts/dmesg/cid-kmsg-limit
index 0cad4115a..97be62c39 100755
--- a/tests/ts/dmesg/cid-kmsg-limit
+++ b/tests/ts/dmesg/cid-kmsg-limit
@@ -23,7 +23,7 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 -K $TS_SELF/cid-kmsg-input \
+$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --kmsg-file $TS_SELF/cid-kmsg-input \
 	>> $TS_OUTPUT 2> $TS_ERRLOG
 
 # dmesg kmsg output can have varying number of caller_id padding spaces
diff --git a/tests/ts/dmesg/colors b/tests/ts/dmesg/colors
index 3d97ad3c2..4bfaaa87e 100755
--- a/tests/ts/dmesg/colors
+++ b/tests/ts/dmesg/colors
@@ -24,6 +24,6 @@ ts_inhibit_custom_colorscheme
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --color=always -F $TS_SELF/input -x >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --color=always --file $TS_SELF/input --decode >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/console-levels b/tests/ts/dmesg/console-levels
index 46dea82e2..bb2c32fae 100755
--- a/tests/ts/dmesg/console-levels
+++ b/tests/ts/dmesg/console-levels
@@ -24,13 +24,13 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..8}; do
-	$TS_HELPER_DMESG -F $TS_SELF/input -l $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --file $TS_SELF/input --level $I >> $TS_OUTPUT 2>/dev/null
 done
 
-$TS_HELPER_DMESG -F $TS_SELF/input -l err+ >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG -F $TS_SELF/input -l emerg+ >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG -F $TS_SELF/input -l +err >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG -F $TS_SELF/input -l +debug >> $TS_OUTPUT 2>/dev/null
-$TS_HELPER_DMESG -F $TS_SELF/input -l + 2>> $TS_OUTPUT >/dev/null
+$TS_HELPER_DMESG --file $TS_SELF/input --level err+ >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --file $TS_SELF/input --level emerg+ >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --file $TS_SELF/input --level +err >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --file $TS_SELF/input --level +debug >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --file $TS_SELF/input --level + 2>> $TS_OUTPUT >/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/decode b/tests/ts/dmesg/decode
index db2fe6e2f..0e2f8b9b8 100755
--- a/tests/ts/dmesg/decode
+++ b/tests/ts/dmesg/decode
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -x -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --decode --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/delta b/tests/ts/dmesg/delta
index 693a789fd..c937a1996 100755
--- a/tests/ts/dmesg/delta
+++ b/tests/ts/dmesg/delta
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -d -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/facilities b/tests/ts/dmesg/facilities
index 36ea60841..74e632618 100755
--- a/tests/ts/dmesg/facilities
+++ b/tests/ts/dmesg/facilities
@@ -24,7 +24,7 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 for I in {-1..12}; do
-	$TS_HELPER_DMESG -F $TS_SELF/input -f $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG --file $TS_SELF/input --facility $I >> $TS_OUTPUT 2>/dev/null
 done
 
 ts_finalize
diff --git a/tests/ts/dmesg/indentation b/tests/ts/dmesg/indentation
index ae4bb0698..8372815ee 100755
--- a/tests/ts/dmesg/indentation
+++ b/tests/ts/dmesg/indentation
@@ -23,9 +23,9 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -F $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_HELPER_DMESG -F $TS_SELF/newlines -x >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_HELPER_DMESG --file $TS_SELF/newlines --decode >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 $TS_HELPER_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>> $TS_ERRLOG
 
diff --git a/tests/ts/dmesg/json b/tests/ts/dmesg/json
index 1b3689ca2..18655ed28 100755
--- a/tests/ts/dmesg/json
+++ b/tests/ts/dmesg/json
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -J -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/kmsg-file b/tests/ts/dmesg/kmsg-file
index 558b24387..c166afb48 100755
--- a/tests/ts/dmesg/kmsg-file
+++ b/tests/ts/dmesg/kmsg-file
@@ -23,6 +23,6 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG -J -K $TS_SELF/kmsg-input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --json --kmsg-file $TS_SELF/kmsg-input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/limit b/tests/ts/dmesg/limit
index 2d71f37f7..9439b644f 100755
--- a/tests/ts/dmesg/limit
+++ b/tests/ts/dmesg/limit
@@ -23,7 +23,7 @@ ts_check_test_command "$TS_HELPER_DMESG"
 export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
-$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 -F $TS_SELF/input \
+$TS_HELPER_DMESG --since @1234567890.124 --until @1234567991 --file $TS_SELF/input \
 	>> $TS_OUTPUT 2> $TS_ERRLOG
 
 ts_finalize
diff --git a/tests/ts/dmesg/timestamp-format b/tests/ts/dmesg/timestamp-format
index 1081327c3..5c27ac621 100755
--- a/tests/ts/dmesg/timestamp-format
+++ b/tests/ts/dmesg/timestamp-format
@@ -24,27 +24,27 @@ export TZ="GMT"
 export DMESG_TEST_BOOTIME="1234567890.123456"
 
 ts_init_subtest "multiple"
-$TS_HELPER_DMESG --time-format raw --time-format ctime --time-format iso -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format raw --ctime --time-format iso --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta"
-$TS_HELPER_DMESG --time-format iso --time-format delta -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format iso --time-format delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-ctime"
-$TS_HELPER_DMESG --time-format reltime --time-format delta --time-format ctime -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --reltime --time-format delta --time-format ctime --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-raw"
-$TS_HELPER_DMESG --time-format raw --time-format ctime --time-format delta -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --time-format raw --time-format ctime --time-format delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "delta-notime"
-$TS_HELPER_DMESG -d -t -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --show-delta --notime --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_init_subtest "notime-delta"
-$TS_HELPER_DMESG -t -d -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG --notime --show-delta --file $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 ts_finalize_subtest
 
 ts_finalize