diff --git a/manifest b/manifest index 106a4d98ac..0d01cba7f0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Faster\simplementation\sof\sthe\saggregate_test_counts\sprocedure\sinside\sof\ntestrunner.tcl. -D 2024-09-05T11:46:43.981 +C Enhance\stestrunner.tcl\sto\skeep\strack\sof\sthe\splatform\sand\sSQLite\sversion\nas\sreported\sby\sindividual\stest\scases\sand\sto\sreport\sthat\sinformation\sin\sthe\nsummary\sat\sthe\send\sof\seach\stest\srun. +D 2024-09-05T12:06:45.482 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 68b23b52e9ba45eb294b2597c27c383d12129afc06e33c8771313c7238bd1c44 x +F test/testrunner.tcl 1ebde7e8b57c464b9eb6ce047977c1edb46688b2ab94cc67e3cd5e4a3645ff00 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 c2c0a9176ae7291a0b72f3d048a2ef5716c325b9f693cdc5eada552e0c881a9d -R f43ab99ba85b48d85b41205bb3574221 +P a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf +R a6deed6e9bd78f423240221d74d8d7b3 U drh -Z ff8ebe5698dd3ab04755716aae5f59e1 +Z 8cf0ea19b5a0efdaca6c57466a00e96c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7f61e5a5d3..9f0908d687 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a01d869520329fb9e786cdc65f359785a95d19d289e4c6b844c758d6e5385aaf +80ebb7c7e686cd936ac834f2258f585a7004762593e0bc859ecd75d6fb0badfd diff --git a/test/testrunner.tcl b/test/testrunner.tcl index ccf888b572..cd9d0daff5 100755 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -290,6 +290,8 @@ set TRG(schema) { state TEXT CHECK( state IN ('','ready','running','done','failed','omit') ), ntest INT, -- Number of test cases run nerr INT, -- Number of errors reported + svers TEXT, -- Reported SQLite version + pltfm TEXT, -- Host platform reported output TEXT -- test output ); @@ -1255,6 +1257,10 @@ proc mark_job_as_finished {jobid output state endtm} { set nerr $a set ntest $b } + regexp {\y\d+ errors out of \d+ tests (on [^\n]+-bit \S+-endian)} \ + $output all pltfm + regexp {\ySQLite \d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [0-9a-fA-F]+} \ + $output svers } r_write_db { if {$state=="failed"} { @@ -1266,7 +1272,7 @@ proc mark_job_as_finished {jobid output state endtm} { trdb eval { UPDATE jobs SET output=$output, state=$state, endtime=$endtm, - ntest=$ntest, nerr=$nerr + ntest=$ntest, nerr=$nerr, svers=$svers, pltfm=$pltfm WHERE jobid=$jobid; UPDATE jobs SET state=$childstate WHERE depid=$jobid; } @@ -1519,7 +1525,16 @@ proc run_testset {} { FROM jobs WHERE endtime>0 } break; set et [elapsetime $totaltime] - puts "$totalerr errors out of $totaltest tests in about $et" + set pltfm {} + trdb eval { + SELECT pltfm, count(*) FROM jobs WHERE pltfm IS NOT NULL + ORDER BY 2 DESC LIMIT 1 + } {puts $pltfm} + puts "$totalerr errors out of $totaltest tests in about $et $pltfm" + trdb eval { + SELECT DISTINCT svers FROM jobs WHERE svers IS NOT NULL + } {puts $svers} + } # Handle the --buildonly option, if it was specified.