From d1b133cd169f674c068c47db58224e9f8db6d13d Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 25 Nov 2025 23:59:31 +0000 Subject: [PATCH] When "testrunner.tcl status -d N" is run but the test database is not yet available, it enters a wait loop until the testing begins. FossilOrigin-Name: 7abc25ff3b24b11c171e715ae96c8e97651d340b7a8bb8125a73902e1ad881ab --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/testrunner.tcl | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 6b8d68651c..4b083a8d8c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\stypo\sin\sthe\sMAKE.BAT -D 2025-11-25T22:50:39.506 +C When\s"testrunner.tcl\sstatus\s-d\sN"\sis\srun\sbut\sthe\stest\sdatabase\sis\snot\syet\navailable,\sit\senters\sa\swait\sloop\suntil\sthe\stesting\sbegins. +D 2025-11-25T23:59:31.304 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1701,7 +1701,7 @@ F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27 -F test/testrunner.tcl 86179a8e78997e9257cb8f738c5624cb23897da5297855578ba74715e64f1602 x +F test/testrunner.tcl 2978373673f9cc30fe65fe0f87bbde05b17f1ce32a65fa0b45fef3ce55fbfee6 x F test/testrunner_data.tcl c507a9afa911c03446ed90442ffd4a98aca02882c3d51bd1177c24795674def8 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 @@ -2180,8 +2180,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 838b7fd5d46ed65f22d1da6256fcf979385e37edc8aec4f19064c2c3dc13f2de -R a76dfbab52d2c79cac6edd6b54b0b879 +P bf54e5fccdf7cd274f3e91a7fd4a23c85f42c0e3163d84ecdb5b9097bdc940d8 +R 7b21d952c4c39595261c74f40aecd6ae U drh -Z ebfc6cad4f972190a6569952ed70995f +Z 60c548eaef43d37f5a69056783f36dc5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 3e012c38dd..5f894a01ec 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bf54e5fccdf7cd274f3e91a7fd4a23c85f42c0e3163d84ecdb5b9097bdc940d8 +7abc25ff3b24b11c171e715ae96c8e97651d340b7a8bb8125a73902e1ad881ab diff --git a/test/testrunner.tcl b/test/testrunner.tcl index 756e4bbcb6..8fe77cc24a 100755 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -706,9 +706,18 @@ if {[llength $argv]>=1 } } - if {![file readable $TRG(dbname)]} { - puts "Database missing: $TRG(dbname)" - exit + set once 1 + while {![file readable $TRG(dbname)]} { + if {$delay==0} { + puts "Database missing: $TRG(dbname)" + exit + } + if {$once} { + set once 0 + puts "Waiting for testing to start...." + flush stdout + } + after [expr {$delay*1000}] } sqlite3 mydb $TRG(dbname) mydb timeout 2000 -- 2.47.3