Ensure that the one-line running status output from testrunner.tcl does not

exceed the 80-char line width of a standard terminal.

FossilOrigin-Name: 1eae0f9ed3c4530d117a8efc4adaf0b2cc422083f0407830a1a6d2a5b970fa1a

diff --git a/manifest b/manifest
index 531fd86fad01eb2dc67f70348277085935dab26b..8d6a1004aa6eaf3131cfb51d43191f4c4edabe77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C auto.def:\sremove\san\sextraneous\sglobal\svar,\ssome\sdead\stcl/makefile\scode/comments,\sand\ssome\sextraneous\soutput.\sRename\san\sinternal-use\sproc.\sDisable\sthe\sext/wasm\scleanup\sin\sthe\stop-level\s(dist)clean\sbecause\sthe\snoise\sfrom\sgmake\sis\sirritating.
-D 2024-11-05T09:49:53.043
+C Ensure\sthat\sthe\sone-line\srunning\sstatus\soutput\sfrom\stestrunner.tcl\sdoes\snot\nexceed\sthe\s80-char\sline\swidth\sof\sa\sstandard\sterminal.
+D 2024-11-05T11:59:45.661
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28
@@ -1720,7 +1720,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
-F test/testrunner.tcl 3c6acf0eecd2b5459082639183f2b4f667aa0b74ddab24e4d37295112c7a5325 x
+F test/testrunner.tcl c40d5700578f8c9d00e0e15f105f645c471bc2c48eb8b013bd2953400f2c6bf0 x
 F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2199,8 +2199,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a8c1a82b56412a4277a3c9bf2b256d3bd22bd8aca9096b8d08fcc0bf7d9364cb
-R 486858acf83a0ad9398b7511ee6bf899
-U stephan
-Z 17b7f42f98ea7458ea07b6ef75ca0d94
+P ee9eb8b157c93b33a8ac201c31169cdd1d2cf2f21da92f7a6a418a41e5a50b7b
+R 42fdf6d683cf4cf4bef385bd5a8dd761
+U drh
+Z 5ea36a74eb3b5e1b4fcf77e0c8195535
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2aaf46d2a21e11378f5b816eadcf044fd1abf6a1..83fd9d0272abfbbc7850eed865808bdc594f7f36 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee9eb8b157c93b33a8ac201c31169cdd1d2cf2f21da92f7a6a418a41e5a50b7b
+1eae0f9ed3c4530d117a8efc4adaf0b2cc422083f0407830a1a6d2a5b970fa1a

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 66fa1058bb3c9aded8c28e0bca4d3cbc43707110..889bfeaffde746c75637eb80b05aeb2ea6a50100 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -547,12 +547,15 @@ proc show_status {db cls} {
 
   set srcdir [file dirname [file dirname $TRG(info_script)]]
   set line "Running: $S(running) (max: $nJob)"
-  if {$S(running)>0 && $fin>10 && [string length $line]<69} {
+  if {$S(running)>0 && $fin>10} {
     set tmleft [expr {($tm/$fin)*($totalw-$fin)}]
     if {$tmleft<0.02*$tm} {
       set tmleft [expr {$tm*0.02}]
     }
-    append line " ETC [elapsetime $tmleft]"
+    set etc " ETC [elapsetime $tmleft]"
+    if {[string length $line]+[string length $etc]<80} {
+      append line $etc
+    }
   }
   puts [format %-79.79s $line]
   if {$S(running)>0} {
@@ -1369,10 +1372,7 @@ proc script_input_ready {fd iJob jobid} {
     set state "done"
     set rc [catch { close $fd } msg]
     if {$rc} { 
-      if {[info exists TRG(reportlength)]} {
-        puts -nonewline "[string repeat " " $TRG(reportlength)]\r"
-      }
-      puts "FAILED: $job(displayname) ($iJob)"
+      puts [format %-79.79s "FAILED: $job(displayname) ($iJob)"]
       set state "failed" 
       if {$TRG(stopOnError)} {
         puts "OUTPUT: $O($iJob)"
@@ -1523,22 +1523,16 @@ proc progress_report {} {
         lappend text "r$v(running,$j)"
       }
     }
+    set report "[elapsetime $tmms] [join $text { }]"
     if {$wdone>0} {
       set tmleft [expr {($tmms/$wdone)*($wtotal-$wdone)}]
-      append text " ETC [elapsetime $tmleft]"
-    }
-  
-    if {[info exists TRG(reportlength)]} {
-      puts -nonewline "[string repeat " " $TRG(reportlength)]\r"
-    }
-    set report "[elapsetime $tmms] [join $text { }]"
-    set TRG(reportlength) [string length $report]
-    if {[string length $report]<100} {
-      puts -nonewline "$report\r"
-      flush stdout
-    } else {
-      puts $report
+      set etc " ETC [elapsetime $tmleft]"
+      if {[string length $report]+[string length $etc]<80} {
+        append report $etc
+      }
     }
+    puts -nonewline [format %-79.79s $report]\r
+    flush stdout
   }
   after $TRG(reporttime) progress_report
 }