From: drh <> Date: Mon, 28 Apr 2025 16:28:00 +0000 (+0000) Subject: Enhance testrunner.tcl so that it does not build testfixture unnecessarily - X-Git-Tag: major-release~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1365bcffbf871273ace51461ad46826ebc88e30b;p=thirdparty%2Fsqlite.git Enhance testrunner.tcl so that it does not build testfixture unnecessarily - if the pattern does not match any TCL test. FossilOrigin-Name: 896d767f1cba64bda7b91b0daebd60ebe4457a58d762da443bf61cf5b39ad2d9 --- diff --git a/manifest b/manifest index cd36ef9f65..def9eb2d88 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stestrunner.tcl\sso\sthat\sit\shonors\spattern\smatches\sin\snon-testfixture\ntests,\ssuch\sas\sfuzzcheck\sand\ssessionfuzz. -D 2025-04-28T16:17:17.167 +C Enhance\stestrunner.tcl\sso\sthat\sit\sdoes\snot\sbuild\stestfixture\sunnecessarily\s-\nif\sthe\spattern\sdoes\snot\smatch\sany\sTCL\stest. +D 2025-04-28T16:28:00.311 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1734,7 +1734,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a -F test/testrunner.tcl 9cf2bd5755077b710b4675ddd20e88271a6baaf8d94c19dbb7021798cec7d537 x +F test/testrunner.tcl 9ba1633c0494fde4bc5a15dad7393c96cab5842674d45ae3fedbb73e646e4a8a x F test/testrunner_data.tcl 07f2d36a6321bfd196975aca237db6bba1991032809264a1abeb62e697196d20 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 @@ -2207,8 +2207,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 7d6005b0d17d86d72757f3578872e82fd12f61ac9160a0277e397df09f6338a9 -R 65434eb108e608265878d208220c17e3 +P 81857474fe90f50b760c22d61a6ad477642dabe1052390cd1614dcec8adb1376 +R 2a7e3de3ac92b862d831bf5772b280f3 U drh -Z 8c6e3b2216a6b6e244ba52b67889d195 +Z aaa50756b963ce47265747d8b22c07a0 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index ddf5a4051d..159a066853 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -81857474fe90f50b760c22d61a6ad477642dabe1052390cd1614dcec8adb1376 +896d767f1cba64bda7b91b0daebd60ebe4457a58d762da443bf61cf5b39ad2d9 diff --git a/test/testrunner.tcl b/test/testrunner.tcl index 479f17868c..480d70a910 100755 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -1044,6 +1044,7 @@ proc job_matches_any_pattern {patternlist jobcmd} { # proc add_tcl_jobs {build config patternlist {shelldepid ""}} { global TRG + set ntcljob 0 set topdir [file dirname $::testdir] set testrunner_tcl [file normalize [info script]] @@ -1087,6 +1088,7 @@ proc add_tcl_jobs {build config patternlist {shelldepid ""}} { set depid [lindex $build 0] if {$shelldepid!="" && [lsearch $lProp shell]>=0} { set depid $shelldepid } + incr ntcljob add_job \ -displaytype tcl \ -displayname $displayname \ @@ -1094,6 +1096,10 @@ proc add_tcl_jobs {build config patternlist {shelldepid ""}} { -depid $depid \ -priority $priority } + if {$ntcljob==0 && [llength $build]>0} { + set bldid [lindex $build 0] + trdb eval {DELETE FROM jobs WHERE rowid=$bldid} + } } proc add_build_job {buildname target {postcmd ""} {depid ""}} {