Faster implementation of the aggregate_test_counts procedure inside of

testrunner.tcl.

FossilOrigin-Name: a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf

diff --git a/manifest b/manifest
index 8775a8ed5fbf47c20dadbf79325c2afc561b392f..106a4d98ace672756c1e192a22de51fdddc9e26b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sdefault\sTCLDIR\sbe\sC:\\Tcl\sin\sthe\sMakefile.msc.
-D 2024-09-04T18:51:59.227
+C Faster\simplementation\sof\sthe\saggregate_test_counts\sprocedure\sinside\sof\ntestrunner.tcl.
+D 2024-09-05T11:46:43.981
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1715,7 +1715,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 982939f0f1835007298b92e52694c207d16ef79143993b35e5cbc9f0c585938b x
+F test/testrunner.tcl 68b23b52e9ba45eb294b2597c27c383d12129afc06e33c8771313c7238bd1c44 x
 F test/testrunner_data.tcl dbc0bb1c5b912dfd1e32b25d544318e412edd6085bd5fc9e6619cb93a739b786
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2212,8 +2212,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 60ac55c4b76355aaf7cbde38bf1f6082ff5612bf4ffc49ab69d00fd4e3d64e64
-R 7c445598106af51bfd865380701cef37
+P c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
+R f43ab99ba85b48d85b41205bb3574221
 U drh
-Z 345e63504eb5893ea2a5338064417dd5
+Z ff8ebe5698dd3ab04755716aae5f59e1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2340dd135495ea506e37d8fd66837763e15d3b29..7f61e5a5d306d47ef9c6a79e773617361df51789 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d
+a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index a63a22d2fc0f9c592629eed5a664ca5a586c1e27..ccf888b5729516584e7007c67a8d93920853dfff 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -633,25 +633,10 @@ if {[llength $argv]>=1
 # Aggregate these numbers and return them.
 #
 proc aggregate_test_counts {db} {
-  set ncase 0
-  set nerr 0
-  $db eval {SELECT output FROM jobs WHERE displaytype IN ('tcl','fuzz')} {
-    set n 0
-    set m 0
-    if {[regexp {(\d+) errors out of (\d+) tests} $output all n m]
-        && [string is integer -strict $n]
-        && [string is integer -strict $m]} {
-      incr ncase $m
-      incr nerr $n
-    } elseif {[regexp {sessionfuzz.*: *(\d+) cases, (\d+) crash} $output \
-                      all m n]
-              && [string is integer -strict $m]
-              && [string is integer -strict $n]} {
-      incr ncase $m
-      incr nerr $n
-    }
-  }
-  return [list $nerr $ncase]
+  set ne 0
+  set nt 0
+  $db eval {SELECT sum(nerr) AS ne, sum(ntest) as nt FROM jobs} break
+  return [list $ne $nt]
 }
 
 #--------------------------------------------------------------------------