tests: add dmesg -d -t and -t -d timestamp format tests

Add two sub-tests to verify that -d -t (delta-notime) and -t -d
(notime-delta) both produce delta-only output regardless of option
order.

Addresses: https://github.com/util-linux/util-linux/issues/4110
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/dmesg/timestamp-format-delta-notime b/tests/expected/dmesg/timestamp-format-delta-notime
new file mode 100644 (file)
index 0000000..2dedd90
--- /dev/null
+++ b/tests/expected/dmesg/timestamp-format-delta-notime
@@ -0,0 +1,106 @@
+[<    0.000000>] example[0]
+[<    0.000000>] example[1]
+[<    7.000000>] example[2]
+[<   19.000000>] example[3]
+[<   37.000000>] example[4]
+[<   61.000000>] example[5]
+[<   91.000000>] example[6]
+[<  127.000000>] example[7]
+[<  169.000000>] example[8]
+[<  217.000000>] example[9]
+[<  271.000000>] example[10]
+[<  331.000000>] example[11]
+[<  397.000000>] example[12]
+[<  469.000000>] example[13]
+[<  547.000000>] example[14]
+[<  631.000000>] example[15]
+[<  721.000000>] example[16]
+[<  817.000000>] example[17]
+[<  919.000000>] example[18]
+[< 1027.000000>] example[19]
+[< 1141.000000>] example[20]
+[< 1261.000000>] example[21]
+[< 1387.000000>] example[22]
+[< 1519.000000>] example[23]
+[< 1657.000000>] example[24]
+[< 1801.000000>] example[25]
+[< 1951.000000>] example[26]
+[< 2107.000000>] example[27]
+[< 2269.000000>] example[28]
+[< 2437.000000>] example[29]
+[< 2611.000000>] example[30]
+[< 2791.000000>] example[31]
+[< 2977.000000>] example[32]
+[< 3169.000000>] example[33]
+[< 3367.000000>] example[34]
+[< 3571.000000>] example[35]
+[< 3781.000000>] example[36]
+[< 3997.000000>] example[37]
+[< 4219.000000>] example[38]
+[< 4447.000000>] example[39]
+[< 4681.000000>] example[40]
+[< 4921.000000>] example[41]
+[< 5167.000000>] example[42]
+[< 5419.000000>] example[43]
+[< 5677.000000>] example[44]
+[< 5941.000000>] example[45]
+[< 6211.000000>] example[46]
+[< 6487.000000>] example[47]
+[< 6769.000000>] example[48]
+[< 7057.000000>] example[49]
+[< 7351.000000>] example[50]
+[< 7651.000000>] example[51]
+[< 7957.000000>] example[52]
+[< 8269.000000>] example[53]
+[< 8587.000000>] example[54]
+[< 8911.000000>] example[55]
+[< 9241.000000>] example[56]
+[< 9577.000000>] example[57]
+[< 9919.000000>] example[58]
+[<10267.000000>] example[59]
+[<10621.000000>] example[60]
+[<10981.000000>] example[61]
+[<11347.000000>] example[62]
+[<11719.000000>] example[63]
+[<12097.000000>] example[64]
+[<12481.000000>] example[65]
+[<12871.000000>] example[66]
+[<13267.000000>] example[67]
+[<13669.000000>] example[68]
+[<14077.000000>] example[69]
+[<14491.000000>] example[70]
+[<14911.000000>] example[71]
+[<15337.000000>] example[72]
+[<15769.000000>] example[73]
+[<16207.000000>] example[74]
+[<16651.000000>] example[75]
+[<17101.000000>] example[76]
+[<17557.000000>] example[77]
+[<18019.000000>] example[78]
+[<18487.000000>] example[79]
+[<18961.000000>] example[80]
+[<19441.000000>] example[81]
+[<19927.000000>] example[82]
+[<20419.000000>] example[83]
+[<20917.000000>] example[84]
+[<21421.000000>] example[85]
+[<21931.000000>] example[86]
+[<22447.000000>] example[87]
+[<22969.000000>] example[88]
+[<23497.000000>] example[89]
+[<24031.000000>] example[90]
+[<24571.000000>] example[91]
+[<25117.000000>] example[92]
+[<25669.000000>] example[93]
+[<26227.000000>] example[94]
+[<26791.000000>] example[95]
+[<27361.000000>] example[96]
+[<27937.000000>] example[97]
+[<28519.000000>] example[98]
+[<29107.000000>] example[99]
+[<29701.000000>] example[100]
+[<30301.000000>] example[101]
+[<30907.000000>] example[102]
+[<31519.000000>] example[103]
+[<32137.000000>] example[104]
+[<3432659.000000>] example[105]

diff --git a/tests/expected/dmesg/timestamp-format-notime-delta b/tests/expected/dmesg/timestamp-format-notime-delta
new file mode 100644 (file)
index 0000000..2dedd90
--- /dev/null
+++ b/tests/expected/dmesg/timestamp-format-notime-delta
@@ -0,0 +1,106 @@
+[<    0.000000>] example[0]
+[<    0.000000>] example[1]
+[<    7.000000>] example[2]
+[<   19.000000>] example[3]
+[<   37.000000>] example[4]
+[<   61.000000>] example[5]
+[<   91.000000>] example[6]
+[<  127.000000>] example[7]
+[<  169.000000>] example[8]
+[<  217.000000>] example[9]
+[<  271.000000>] example[10]
+[<  331.000000>] example[11]
+[<  397.000000>] example[12]
+[<  469.000000>] example[13]
+[<  547.000000>] example[14]
+[<  631.000000>] example[15]
+[<  721.000000>] example[16]
+[<  817.000000>] example[17]
+[<  919.000000>] example[18]
+[< 1027.000000>] example[19]
+[< 1141.000000>] example[20]
+[< 1261.000000>] example[21]
+[< 1387.000000>] example[22]
+[< 1519.000000>] example[23]
+[< 1657.000000>] example[24]
+[< 1801.000000>] example[25]
+[< 1951.000000>] example[26]
+[< 2107.000000>] example[27]
+[< 2269.000000>] example[28]
+[< 2437.000000>] example[29]
+[< 2611.000000>] example[30]
+[< 2791.000000>] example[31]
+[< 2977.000000>] example[32]
+[< 3169.000000>] example[33]
+[< 3367.000000>] example[34]
+[< 3571.000000>] example[35]
+[< 3781.000000>] example[36]
+[< 3997.000000>] example[37]
+[< 4219.000000>] example[38]
+[< 4447.000000>] example[39]
+[< 4681.000000>] example[40]
+[< 4921.000000>] example[41]
+[< 5167.000000>] example[42]
+[< 5419.000000>] example[43]
+[< 5677.000000>] example[44]
+[< 5941.000000>] example[45]
+[< 6211.000000>] example[46]
+[< 6487.000000>] example[47]
+[< 6769.000000>] example[48]
+[< 7057.000000>] example[49]
+[< 7351.000000>] example[50]
+[< 7651.000000>] example[51]
+[< 7957.000000>] example[52]
+[< 8269.000000>] example[53]
+[< 8587.000000>] example[54]
+[< 8911.000000>] example[55]
+[< 9241.000000>] example[56]
+[< 9577.000000>] example[57]
+[< 9919.000000>] example[58]
+[<10267.000000>] example[59]
+[<10621.000000>] example[60]
+[<10981.000000>] example[61]
+[<11347.000000>] example[62]
+[<11719.000000>] example[63]
+[<12097.000000>] example[64]
+[<12481.000000>] example[65]
+[<12871.000000>] example[66]
+[<13267.000000>] example[67]
+[<13669.000000>] example[68]
+[<14077.000000>] example[69]
+[<14491.000000>] example[70]
+[<14911.000000>] example[71]
+[<15337.000000>] example[72]
+[<15769.000000>] example[73]
+[<16207.000000>] example[74]
+[<16651.000000>] example[75]
+[<17101.000000>] example[76]
+[<17557.000000>] example[77]
+[<18019.000000>] example[78]
+[<18487.000000>] example[79]
+[<18961.000000>] example[80]
+[<19441.000000>] example[81]
+[<19927.000000>] example[82]
+[<20419.000000>] example[83]
+[<20917.000000>] example[84]
+[<21421.000000>] example[85]
+[<21931.000000>] example[86]
+[<22447.000000>] example[87]
+[<22969.000000>] example[88]
+[<23497.000000>] example[89]
+[<24031.000000>] example[90]
+[<24571.000000>] example[91]
+[<25117.000000>] example[92]
+[<25669.000000>] example[93]
+[<26227.000000>] example[94]
+[<26791.000000>] example[95]
+[<27361.000000>] example[96]
+[<27937.000000>] example[97]
+[<28519.000000>] example[98]
+[<29107.000000>] example[99]
+[<29701.000000>] example[100]
+[<30301.000000>] example[101]
+[<30907.000000>] example[102]
+[<31519.000000>] example[103]
+[<32137.000000>] example[104]
+[<3432659.000000>] example[105]

diff --git a/tests/ts/dmesg/timestamp-format b/tests/ts/dmesg/timestamp-format
index feb1ad8b67fac6cd8277661eb6b9164f3eb926a7..07f51b2599983a50fe5c84fb35d7ccb461afc242 100755 (executable)
--- a/tests/ts/dmesg/timestamp-format
+++ b/tests/ts/dmesg/timestamp-format
@@ -39,4 +39,12 @@ 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_finalize_subtest
 
+ts_init_subtest "delta-notime"
+$TS_HELPER_DMESG -d -t -F $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_finalize_subtest
+
 ts_finalize