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 d1318bf519aaf6c9cb585d4797788fdbdf9fdadd..5cbfb5b429dfa3cc61f175d50e4adb2f12f26c60 100755 (executable)
--- 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 267205104a7ac2d57f60af3d92fd317bb728487e..71f1e4c8ef90d6aa2dd9744de2848a6977edcf9a 100755 (executable)
--- 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 5bcf488c2cbe8f4a6b01e76c7bec56cbc7bd522e..051927a3978fbc99c128b678255e7fc4928ee0fe 100755 (executable)
--- 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 d4eb5c7f713ae3d0a111313ec40f3cc626cb9032..a1a767dbc19dbf65c9edb911ef6b011368d4c2a6 100755 (executable)
--- 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 65aaa66948330ea00507441e97054761a2f6c9ba..d5fc1e157b9ec006be188a8907e39415500af752 100755 (executable)
--- 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 cfd84a49b564f53a41092c8484aee93abf081b28..38cac1704d9df062ca618f271b4c7875c667b8df 100755 (executable)
--- 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 9cabc446e29ea8f9250bbf6ad2007a4bf0096d69..76cbc6af079dca6a0a78c9db9b9007bd2be5e431 100755 (executable)
--- 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 ce63828058ecef20b71ea42baf5166a76d2b6341..25ed8b5ba249bc06590a5fb8af5f9e1ed68a32bd 100755 (executable)
--- 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 0cad4115acee9b40877e4bf4586c02cba40f1ee5..97be62c3970074e1a84b1651120cdb90423d4ea2 100755 (executable)
--- 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 3d97ad3c22b15a63d4e258cbb0abf50819c0e4bc..4bfaaa87e05554dcd13e80bc15ad3b5253029c67 100755 (executable)
--- 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 46dea82e24bf2bfbcf305aaf8c0d955055be5330..bb2c32fae914c84cdb2fe80b0399a5dbe3915a25 100755 (executable)
--- 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 db2fe6e2fba88ba84d5d71118ca234dd1c214324..0e2f8b9b85ddb9cd43b53cb9a16bce0b765c9cdd 100755 (executable)
--- 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 693a789fd63635555885a27d73f4c9060e44ed0c..c937a19966d5fb426a51884ac9932ae873183007 100755 (executable)
--- 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 36ea608418e4987e6c205edc003ef2a1579be75f..74e632618721b9295be6d457794f70de106ae84f 100755 (executable)
--- 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 ae4bb069800c976fc148581b632dc90674862a8a..8372815eee68eda7dfca237205353d25b979c79b 100755 (executable)
--- 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 1b3689ca209ae0270dc5a726ee590d87518d5869..18655ed287ae41e85d6344381798cfc8d90852eb 100755 (executable)
--- 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 558b243877a02cadb613cc12b3354a2128cc4d5b..c166afb480277a001735a87574ae084f7a204a9a 100755 (executable)
--- 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 2d71f37f74d925f411093592542650465e0798fe..9439b644f5eb90950be05abae6395d719864fc48 100755 (executable)
--- 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 1081327c396b3adc3056f0bb7f9f0f93d937261e..5c27ac621ddd8bcafaaf3f99a7222c5b5756b786 100755 (executable)
--- 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