mirror of
https://github.com/curl/curl.git
synced 2026-04-11 12:01:42 +08:00
193397bf4e
- Each time field is now 7 characters wide, so that the total width never exceeds 79 columns so that it works correctly also in Windows terminals. The title lines are adjusted accordingly. This is accomplished by using h:mm:ss style up to 10 hours, and for longer periods switch to "nnX nnY" style output. For hours, days, months and years. For less than one hour, the hour field is now dropped. When no time info is provided, the field is now space-only. No more `-:--:--`. Also fixed the output for really long times which previously was completely broken. The largest time now shows as ">99999y". (Becase I can't figure out a better way). - For sizes, the widths are now properly fixed to 6 characters. When displaying a unit with less than 3 digits, it shows two decimal precision like "16777215 => 15.99M" and one decmal otherwise: "262143 => 255.9k" Also fixes the decimal math. 131071 is 127.9k, which it previously did not show. - The time and size field outputs are now properly verified in test 1636. Fixes #20122 Closes #20173 fixup use only space when no time exists Drop the hour from the display when zero
162 lines
4.2 KiB
XML
162 lines
4.2 KiB
XML
<?xml version="1.0" encoding="US-ASCII"?>
|
|
<testcase>
|
|
<info>
|
|
<keywords>
|
|
unittest
|
|
time2str
|
|
max6out
|
|
</keywords>
|
|
</info>
|
|
|
|
<client>
|
|
<features>
|
|
unittest
|
|
</features>
|
|
|
|
<name>
|
|
time2str and max6out
|
|
</name>
|
|
<command>
|
|
%LOGDIR/%TESTNUMBER
|
|
</command>
|
|
</client>
|
|
<verify>
|
|
<stdout mode="text">
|
|
time2str
|
|
0 - %SP%SP%SP%SP%SP%SP%SP
|
|
1 - 00:01
|
|
3 - 00:03
|
|
7 - 00:07
|
|
15 - 00:15
|
|
31 - 00:31
|
|
63 - 01:03
|
|
127 - 02:07
|
|
255 - 04:15
|
|
511 - 08:31
|
|
1023 - 17:03
|
|
2047 - 34:07
|
|
4095 - 1:08:15
|
|
8191 - 2:16:31
|
|
16383 - 4:33:03
|
|
32767 - 9:06:07
|
|
65535 - 18h 12m
|
|
131071 - 36h 24m
|
|
262143 - 72h 49m
|
|
524287 - 6d 01h
|
|
1048575 - 12d 03h
|
|
2097151 - 24d 06h
|
|
4194303 - 48d 13h
|
|
8388607 - 97d 02h
|
|
16777215 - 194d
|
|
33554431 - 388d
|
|
67108863 - 776d
|
|
134217727 - 51m
|
|
268435455 - 103m
|
|
536870911 - 207m
|
|
1073741823 - 414m
|
|
2147483647 - 828m
|
|
4294967295 - 136y
|
|
8589934591 - 272y
|
|
17179869183 - 544y
|
|
34359738367 - 1089y
|
|
68719476735 - 2179y
|
|
137438953471 - 4358y
|
|
274877906943 - 8716y
|
|
549755813887 - 17432y
|
|
1099511627775 - 34865y
|
|
2199023255551 - 69730y
|
|
4398046511103 - >99999y
|
|
8796093022207 - >99999y
|
|
17592186044415 - >99999y
|
|
35184372088831 - >99999y
|
|
70368744177663 - >99999y
|
|
140737488355327 - >99999y
|
|
281474976710655 - >99999y
|
|
562949953421311 - >99999y
|
|
1125899906842623 - >99999y
|
|
2251799813685247 - >99999y
|
|
4503599627370495 - >99999y
|
|
9007199254740991 - >99999y
|
|
18014398509481983 - >99999y
|
|
36028797018963967 - >99999y
|
|
72057594037927935 - >99999y
|
|
144115188075855871 - >99999y
|
|
288230376151711743 - >99999y
|
|
576460752303423487 - >99999y
|
|
1152921504606846975 - >99999y
|
|
2305843009213693951 - >99999y
|
|
4611686018427387903 - >99999y
|
|
max6out
|
|
0 - 0
|
|
1 - 1
|
|
3 - 3
|
|
7 - 7
|
|
15 - 15
|
|
31 - 31
|
|
63 - 63
|
|
127 - 127
|
|
255 - 255
|
|
511 - 511
|
|
1023 - 1023
|
|
2047 - 2047
|
|
4095 - 4095
|
|
8191 - 8191
|
|
16383 - 16383
|
|
32767 - 32767
|
|
65535 - 65535
|
|
131071 - 127.9k
|
|
262143 - 255.9k
|
|
524287 - 511.9k
|
|
1048575 - 0.99M
|
|
2097151 - 1.99M
|
|
4194303 - 3.99M
|
|
8388607 - 7.99M
|
|
16777215 - 15.99M
|
|
33554431 - 31.99M
|
|
67108863 - 63.99M
|
|
134217727 - 127.9M
|
|
268435455 - 255.9M
|
|
536870911 - 511.9M
|
|
1073741823 - 0.99G
|
|
2147483647 - 1.99G
|
|
4294967295 - 3.99G
|
|
8589934591 - 7.99G
|
|
17179869183 - 15.99G
|
|
34359738367 - 31.99G
|
|
68719476735 - 63.99G
|
|
137438953471 - 127.9G
|
|
274877906943 - 255.9G
|
|
549755813887 - 511.9G
|
|
1099511627775 - 0.99T
|
|
2199023255551 - 1.99T
|
|
4398046511103 - 3.99T
|
|
8796093022207 - 7.99T
|
|
17592186044415 - 15.99T
|
|
35184372088831 - 31.99T
|
|
70368744177663 - 63.99T
|
|
140737488355327 - 127.9T
|
|
281474976710655 - 255.9T
|
|
562949953421311 - 511.9T
|
|
1125899906842623 - 0.99P
|
|
2251799813685247 - 1.99P
|
|
4503599627370495 - 3.99P
|
|
9007199254740991 - 7.99P
|
|
18014398509481983 - 15.99P
|
|
36028797018963967 - 31.99P
|
|
72057594037927935 - 63.99P
|
|
144115188075855871 - 127.9P
|
|
288230376151711743 - 255.9P
|
|
576460752303423487 - 511.9P
|
|
1152921504606846975 - 0.99E
|
|
2305843009213693951 - 1.99E
|
|
4611686018427387903 - 3.99E
|
|
131072 - 128.0k
|
|
12645826 - 12.05M
|
|
1073741824 - 1.00G
|
|
12938588979 - 12.04G
|
|
1099445657078333 - 999.9T
|
|
</stdout>
|
|
</verify>
|
|
|
|
</testcase>
|