From 9c8235b1bd62faa9afbcf85523980be8b908f075 Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 18 Nov 2024 13:29:16 +0000 Subject: [PATCH] Fix minor problems in testrunner.tcl that pop up when the command-line arguments are such that no tests are run. FossilOrigin-Name: 321ded32f67550e964cd64d61aa0cbc0029ce2fdee4588a46b01dbb5aa87150b --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/testrunner.tcl | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 209310638f..187a7787d8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\s--vfstrace\soutput\sfrom\sthe\sCLI\sgo\sto\sthe\ssame\soutput\schannel\sas\neverything\selse. -D 2024-11-17T11:42:43.363 +C Fix\sminor\sproblems\sin\stestrunner.tcl\sthat\spop\sup\swhen\sthe\scommand-line\sarguments\nare\ssuch\sthat\sno\stests\sare\srun. +D 2024-11-18T13:29:16.826 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -1719,7 +1719,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 c40d5700578f8c9d00e0e15f105f645c471bc2c48eb8b013bd2953400f2c6bf0 x +F test/testrunner.tcl 90ed8b6c2b26dc1f6af08aeb04670a5df86172f3d9828d8af000f972afa50061 x F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 @@ -2198,8 +2198,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 d07be336eaeb9a5d56ac6e1b63f4d8e50d3ac236f5953cc178ef34542a7cd8fa -R 173665514e770745563aa2982f85029a +P f71d4900205ae6ee41f849c4026d0fe4d6cf281dfc3bac8105fc8e242d128b67 +R c842f5cfce9a13599fcce2ed5a6b5bb2 U drh -Z d67df32afae4b3e2bba6c9bfe32d205b +Z c55681dc305689429003d496466dfaa7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 611653469b..527bf0148d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f71d4900205ae6ee41f849c4026d0fe4d6cf281dfc3bac8105fc8e242d128b67 +321ded32f67550e964cd64d61aa0cbc0029ce2fdee4588a46b01dbb5aa87150b diff --git a/test/testrunner.tcl b/test/testrunner.tcl index 889bfeaffd..d365092e05 100755 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -465,6 +465,7 @@ if {[string compare -nocase script [lindex $argv 0]]==0} { # number of milliseconds in the argument. # proc elapsetime {ms} { + if {$ms==""} {set ms 0} set s [expr {int(($ms+500.0)*0.001)}] set hr [expr {$s/3600}] set mn [expr {($s/60)%60}] @@ -1603,6 +1604,8 @@ proc run_testset {} { SELECT pltfm, count(*) FROM jobs WHERE pltfm IS NOT NULL ORDER BY 2 DESC LIMIT 1 } break + if {$totalerr==""} {set totalerr 0} + if {$totaltest==""} {set totaltest 0} puts "$totalerr errors out of $totaltest tests in $et $pltfm" trdb eval { SELECT DISTINCT substr(svers,1,79) as v1 FROM jobs WHERE svers IS NOT NULL -- 2.47.2