From: drh <>
Date: Tue, 27 Aug 2024 19:28:21 +0000 (+0000)
Subject: Further improvement to the status display in testrunner.tcl.  Show the
X-Git-Tag: version-3.47.0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71475478a1f3c00043144164858802c65b4004c1;p=thirdparty%2Fsqlite.git

Further improvement to the status display in testrunner.tcl.  Show the
number of errors and the number of test cases on the status summary.

FossilOrigin-Name: dbc1ac8692feccde271eaca78f2833c8bb7bf620088c8f975692d6ae2c8ba53a
---

diff --git a/manifest b/manifest
index 95f0b78d9e..e4f301cbb5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\simplementation\sof\s"wrapper"\stokenizers\sto\smake\sthem\smore\srobust\sin\sthe\scase\swhere\sthe\sdatabase\sconnection\sis\sclosed\sbefore\sthe\stokenizers\sare\sdeleted.
-D 2024-08-27T19:27:40.626
+C Further\simprovement\sto\sthe\sstatus\sdisplay\sin\stestrunner.tcl.\s\sShow\sthe\nnumber\sof\serrors\sand\sthe\snumber\sof\stest\scases\son\sthe\sstatus\ssummary.
+D 2024-08-27T19:28:21.475
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1714,7 +1714,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 21449521b796376fb4341d84bdf9dae6befc409e2273f795b4bfda78644da22c
+F test/testrunner.tcl dfb6049b07a44559a2cba909589d56bfe2d9f5ce1828ad3537e350183be3416f
 F test/testrunner_data.tcl b281136c9a4a3cb2e6772a87c2e94efad0c12ea3e7d0710521a3cad964f879a1
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 40b232924c973f8d94605946fff75acbe120d90634a2eaf38bd31649e9f1390b
-R 37747ff8c02c47392327f3909e12ba2c
-U dan
-Z 559c141ac65916995897dbbf28b9ea88
+P 7c0001d6eb43f89144eb84d9e30f575a3feed401d685a0d1f260692e419b2df2
+R 2b16d26e239f800d0fd65b874c223ff3
+U drh
+Z 3e4827c72f9a5e7f0a58061fb0e5d912
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b2a520b2f8..f88cc1fe3b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c0001d6eb43f89144eb84d9e30f575a3feed401d685a0d1f260692e419b2df2
+dbc1ac8692feccde271eaca78f2833c8bb7bf620088c8f975692d6ae2c8ba53a
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 88acae3c0e..bf9e46d934 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -455,6 +455,11 @@ proc show_status {db cls} {
     incr S($state) $cnt
     incr total $cnt
   }
+  set nt 0
+  set ne 0
+  $db eval {
+    SELECT sum(ntest) AS nt, sum(nerr) AS ne FROM jobs HAVING nt>0
+  } break
   set fin [expr $S(done)+$S(failed)]
   if {$cmdline!=""} {set cmdline " $cmdline"}
 
@@ -467,14 +472,10 @@ proc show_status {db cls} {
   } else {
     set clreol ""
   }
-  set f ""
-  if {$S(failed)>0} {
-    set f "$S(failed) FAILED, "
-  }
   puts [format %-79s "Command line: \[testrunner.tcl$cmdline\]$clreol"]
-  puts [format %-79s "Jobs:         $nJob"]
-  puts [format %-79s "Summary:      [elapsetime $tm], ($fin/$total) finished,\
-                      ${f}$S(running) running  "]
+  puts [format %-79s "Cores:        $nJob max $S(running) active"]
+  puts [format %-79s "Summary:      [elapsetime $tm], $fin/$total tasks,\
+                      $ne errors, $nt tests"]
 
   set srcdir [file dirname [file dirname $TRG(info_script)]]
   if {$S(running)>0} {