Improved comments explaining the logic, and improved diagnostic messages

when testrunner.tcl encounters trouble loading the sqlite3 extension.

FossilOrigin-Name: 8d820b0ccfccff94ed5b7297fa587ac27a74e990f233cfe229da7409ab2e3af8

diff --git a/manifest b/manifest
index f065ff7fab4d6fed00cb9297fc09a597bf030073..038ec2424af5cd89f6e6da5f6fdffe03be307433 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\supdates\sto\stestrunner\sdocumentation.
-D 2026-04-16T17:07:23.368
+C Improved\scomments\sexplaining\sthe\slogic,\sand\simproved\sdiagnostic\smessages\nwhen\stestrunner.tcl\sencounters\strouble\sloading\sthe\ssqlite3\sextension.
+D 2026-04-16T19:33:04.715
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1718,7 +1718,7 @@ F test/temptrigfault.tes fc5918e64f3867156fefe7cfca9d8e1f495134a5229b2b511b0dc11
 F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3fb4769d61
 F test/tester.tcl 2d943f60200e0a36bcd3f1f0baf181a751cd3604ef6b6bd4c8dc39b4e8a53116
 F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
-F test/testrunner.tcl af3dd4e89739b18f9e23ab1c62828cd53a0902e4140269c49485dd6deba9d0f0 x
+F test/testrunner.tcl 3c0f022bc821f5a9bb79c257c9c196d975578167747e544d4980250b22310c3e x
 F test/testrunner_data.tcl dfcf192d274e965845189cc014ac89fff91dde92b6e2ac9e1262897fc21ee2e0
 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
@@ -2201,8 +2201,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P e6929022b71c6bff7aa9cfbdb8a5e80499ca856b8c06d4211c55311b48704a08
-R e72d5e901a263ebcbe80388807e7b6df
+P f8507bd5e221783175be2bb7b907c098e0970b1cbcb01817df7217005eab9ab4
+R 8adf41537c2948394c55449fb6e409d2
 U drh
-Z a1fd3877c2c5ab5147c44c97772a52a3
+Z 1ff2a9c88997f7224efcc908a6e8128c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 94ab377574f313bd4a25a6c3b8eab032f66c9a69..ce30a697298706c4ca8f54051e8fcc99aaa95b9f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f8507bd5e221783175be2bb7b907c098e0970b1cbcb01817df7217005eab9ab4
+8d820b0ccfccff94ed5b7297fa587ac27a74e990f233cfe229da7409ab2e3af8

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 60944b3915bc7414a419a527fec72cecb5ca0735..21939703eedcf43942709ca915f4cb4db202d04c 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -34,7 +34,15 @@ proc find_interpreter {} {
   set rc [catch { package require sqlite3 }]
   if {$rc} {
     if {[file readable pkgIndex.tcl] && [catch {source pkgIndex.tcl}]==0} {
+      # Since $dir is defined to be the [pwd], if the "source pkgIndex.tcl"
+      # worked, that should have enabled us to use the locally built 
+      # copy of the TCL extension.
       set rc [catch { package require sqlite3 }]
+      if {!$rc} {
+        puts "Using the locally built copy of the \"sqlite3\" tcl extension"
+      } else {
+        puts "The locally built copy of the \"sqlite3\" tcl extension does work..."
+      }
     }
   }
   if {$rc} {
@@ -49,7 +57,7 @@ proc find_interpreter {} {
     }
   }
   if {$rc} {
-    puts "Cannot find tcl package sqlite3: Trying to build it now..."
+    puts "Cannot find tcl package \"sqlite3\": Trying to build it now..."
     if {$::tcl_platform(platform) eq "windows"} {
       set bat [open make-tcl-extension.bat w]
       puts $bat "nmake /f Makefile.msc tclextension"