Shorten the status line for testrunner.tcl so that it fits on an 80-character

terminal.

FossilOrigin-Name: b760a7307c453d95cf3b302c9867c84a9c899956c16c2ce1ea6cce8f025db425
This commit is contained in:
drh 2023-02-06 14:48:02 +00:00
parent adc21bd434
commit 634ed64312
3 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,5 @@
C Fix\serror\sin\sthe\sreleasetest\smakefile\starget\sfrom\sthe\sprevious\scheck-in. C Shorten\sthe\sstatus\sline\sfor\stestrunner.tcl\sso\sthat\sit\sfits\son\san\s80-character\nterminal.
D 2023-02-06T14:16:15.272 D 2023-02-06T14:48:02.936
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -1566,7 +1566,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d
F test/testrunner.tcl fb6249e9538470959b4957a39e80376a2fb9f157c67dde2c020273a2b96af947 F test/testrunner.tcl cd6fbd8c0fdb61b3b3cdd732c2d4fa9065b1b976815145b8cfdcb7ddad2a0bef
F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8 F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8
F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@ -2048,8 +2048,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 1b95676b05701952cab7087f528028c48302f611fe63799551dc45098354d27f P e7fe287d7904166c05d31b96ec8fd6f09318869c57437d1c661db7b79e6d8bf2
R c838184d0987bde5d37655cf13ea0c8c R 275b3dab9dd605034221e4747a852771
U drh U drh
Z d85b5681980ad0c5f219ec22c47716e4 Z fb7328efb2b2bb6f04a225789570eae4
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

View File

@ -1 +1 @@
e7fe287d7904166c05d31b96ec8fd6f09318869c57437d1c661db7b79e6d8bf2 b760a7307c453d95cf3b302c9867c84a9c899956c16c2ce1ea6cce8f025db425

View File

@ -766,7 +766,7 @@ proc one_line_report {} {
global TRG global TRG
set tm [expr [clock_milliseconds] - $TRG(starttime)] set tm [expr [clock_milliseconds] - $TRG(starttime)]
set tm [format "%.2f" [expr $tm/1000.0]] set tm [format "%d" [expr int($tm/1000.0 + 0.5)]]
foreach s {ready running done failed} { foreach s {ready running done failed} {
set v($s,build) 0 set v($s,build) 0
@ -792,16 +792,20 @@ proc one_line_report {} {
set text "" set text ""
foreach j [array names t] { foreach j [array names t] {
set fin [expr $v(done,$j) + $v(failed,$j)] set fin [expr $v(done,$j) + $v(failed,$j)]
lappend text "$j: ($fin/$t($j)) f=$v(failed,$j) r=$v(running,$j)" lappend text "$j ($fin/$t($j)) f=$v(failed,$j) r=$v(running,$j)"
} }
if {[info exists TRG(reportlength)]} { if {[info exists TRG(reportlength)]} {
puts -nonewline "[string repeat " " $TRG(reportlength)]\r" puts -nonewline "[string repeat " " $TRG(reportlength)]\r"
} }
set report "${tm}s: [join $text { || }]" set report "${tm}s: [join $text { }]"
set TRG(reportlength) [string length $report] set TRG(reportlength) [string length $report]
puts -nonewline "$report\r" if {[string length $report]<80} {
flush stdout puts -nonewline "$report\r"
flush stdout
} else {
puts $report
}
after $TRG(reporttime) one_line_report after $TRG(reporttime) one_line_report
} }