From: drh <> Date: Sun, 5 Jan 2025 11:19:32 +0000 (+0000) Subject: Improvements to TCL extension test procedure description. Improvements to X-Git-Tag: major-relase~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b53358f8f2179e920bbe58d2e8f257d50dcfaac;p=thirdparty%2Fsqlite.git Improvements to TCL extension test procedure description. Improvements to the tclextension-list and tclextension-verify makefile targets to suppress unnecessary output. FossilOrigin-Name: 3e92fea09af13259d61afd2953fe5f3fc16e3cedfef09e350903aa5299b8e469 --- diff --git a/Makefile.msc b/Makefile.msc index 5d3d4c01d0..33c5ef107e 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -1892,10 +1892,10 @@ tclextension-uninstall: $(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --uninstall tclextension-list: - $(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --info + @ $(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --info tclextension-verify: sqlite3.h - $(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --version-check + @ $(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --version-check # <> diff --git a/doc/tcl-extension-testing.md b/doc/tcl-extension-testing.md index 10c57b7c36..4835fe1be9 100644 --- a/doc/tcl-extension-testing.md +++ b/doc/tcl-extension-testing.md @@ -1,9 +1,22 @@ # Test Procedures For The SQLite TCL Extension +## 1.0 Background -## 1.0 Testing On Unix-like Systems (Including Mac) +The SQLite TCL extension logic (in the +"[tclsqlite.c](/file/src/tclsqlite3.c)" source +file) is statically linked into "textfixture" executable +which is the program used to do more of the testing +associated with "make test", "make devtest", and/or +"make releasetest". So the functionality of the SQLite +TCL extension is thoroughly vetted during normal testing. The +procedures below are designed to test the loadable extension +aspect of the SQLite TCL extension, and in particular to verify +that the "make tclextension-install" build target works and that +an ordinary tclsh can subsequently run "package require sqlite3". -### 1.1 Setup +## 2.0 Testing On Unix-like Systems (Including Mac) + +### 2.1 Setup
  1. @@ -21,7 +34,7 @@ of the TCL libraries and the SQLite TCL Extensions.
-### 1.2 Building the TCL libraries and tclsh executables +### 2.2 Building the TCL libraries and tclsh executables
  1. `mkdir $TCLTD $TCLTD/tcl86 $TCLTD/tcl90` @@ -38,7 +51,7 @@
  2. `make install`
-### 1.3 Building the SQLite TCL extension +### 2.3 Building the SQLite TCL extension
  1. `cd $SRCCO` @@ -54,7 +67,7 @@
  2. `make tclextension-verify`
-### 1.4 Additional sanity tests +### 2.4 Additional sanity tests
  1. @@ -64,15 +77,15 @@ ↑ Verify thousands of lines of output with no errors
-### 1.5 Cleanup +### 2.5 Cleanup
  1. `rm -rf $TCLTD`
-## 2.0 Testing On Windows +## 3.0 Testing On Windows -### 2.1 Setup for Windows +### 3.1 Setup for Windows
  1. @@ -97,7 +110,7 @@ ↑ remember the original %PATH% value
-### 2.2 Building the TCL libraries and tclsh.exe executables on Windows +### 3.2 Building the TCL libraries and tclsh.exe executables on Windows
  1. `mkdir %TCLTD% %TCLTD%\tcl86 %TCLTD%\tcl90` @@ -122,7 +135,7 @@
  2. `nmake /f makefile.vc install`
-### 2.3 Building the SQLite TCL extension on Windows +### 3.3 Building the SQLite TCL extension on Windows
  1. `cd %SRCCO%` @@ -142,7 +155,7 @@
  2. `nmake /f Makefile.msc tclextension-verify`
-### 2.4 Additional sanity tests for Windows +### 3.4 Additional sanity tests for Windows
  1. @@ -154,7 +167,7 @@ ↑ Verify thousands of lines of output with no errors
-### 2.5 Cleanup +### 3.5 Cleanup
  1. `rm -rf %TCLTD%` diff --git a/main.mk b/main.mk index 28c4245aab..a22b0dfcdf 100644 --- a/main.mk +++ b/main.mk @@ -1572,14 +1572,14 @@ tclextension-uninstall: # by $TCLSH_CMD, including prior versions. # tclextension-list: - $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info + @ $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info # Verify that the SQLite TCL extension that is loaded by default # in $(TCLSH_CMD) is the same as the version of SQLite for the # current source tree # tclextension-verify: sqlite3.h - $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --version-check + @ $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --version-check # # FTS5 things diff --git a/manifest b/manifest index 28f03fcd38..57402835e3 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Improvements\sto\stesting\sand\svalidation\sof\sthe\sSQLite\sTCL\sextension. -D 2025-01-04T20:50:21.155 +C Improvements\sto\sTCL\sextension\stest\sprocedure\sdescription.\s\sImprovements\sto\nthe\stclextension-list\sand\stclextension-verify\smakefile\stargets\sto\ssuppress\nunnecessary\soutput. +D 2025-01-05T11:19:32.428 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d F Makefile.in ad349acf91b3569033439fe498fa197aa530cafaa01362eb7daad2f84e43d265 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0 -F Makefile.msc 9180dae8de9534393c8a7c7d3b660deb6de5d29910471991738eed1b19c1aaa1 +F Makefile.msc 39785ec45f9ae0311e49094eff2ee079562246fed6be3b9f632a99d4df20056a F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 F VERSION 8dc0c3df15fd5ff0622f88fc483533fce990b1cbb2f5fb9fdfb4dbd71eef2889 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5 @@ -61,7 +61,7 @@ F doc/json-enhancements.md e356fc834781f1f1aa22ee300027a270b2c960122468499bf347b F doc/jsonb.md 5fab4b8613aa9153fbeb6259297bd4697988af8b3d23900deba588fa7841456b F doc/lemon.html 8b266ff711d2ec7f867c3dca37634963f48a630329908cc282beebfa8c708706 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710 -F doc/tcl-extension-testing.md ab39979265fd0e0aa1d31dfb9d468761470d8d84a285d49f11b3ed748224e2f4 +F doc/tcl-extension-testing.md 2d9c2b443ff978c679266cc77c505bc750ad41cad95c7ff57bcd261894db7685 F doc/testrunner.md 15583cf8c7d8a1c3378fd5d4319ca769a14c4d950a5df9b015d01d5be290dc69 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56 @@ -700,7 +700,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk 566aff71e11c52e10f81548e60f79c48cc267cb4b9971e71720047105da4304b +F main.mk fe86d83158b547e02f8d08aa6af2130540746a4a61de7c61ea8b9d09eb06acd4 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2205,8 +2205,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 4270abc071ced9e7ec1fed3c387262cc1912e321e37e45e547a1088dbb022702 -R e76bc68f8d16f2d1c5c9148746df5950 +P 9d7597cad4a167aef7688e85513d8695e8d919e41f5cd44909aefee5ddf13345 +R dea89f80d3d0e645bc0886ea1ea08414 U drh -Z 3470080ccfb271429f7dd29c45e9a752 +Z 5cb00fd50654015e2128f97c99b05bfe # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8f0477bff4..cd948c9ac2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9d7597cad4a167aef7688e85513d8695e8d919e41f5cd44909aefee5ddf13345 +3e92fea09af13259d61afd2953fe5f3fc16e3cedfef09e350903aa5299b8e469