Updates to compile-time option usage and especially to the compile-time option

test script in tool/omittest.tcl.

FossilOrigin-Name: fece588b186c4f9f76d626313e35336fd5681e966e9bd0fa1053b147c4e3c315

diff --git a/manifest b/manifest
index 5b94bf1dd7c487485832a61ba2938ca163c16fc1..b56124fb5dea00089113c0b232123560bca6605c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\spager2-3.1\stest\scase\sso\sthat\sit\sdoes\snot\srun\sif\sa\srequired\ndependence\s(shared-cache)\sis\somitted\sfrom\sthe\sbuild.\s\sFix\sfor\n[forum:/forumpost/7a028538a7|forum\spost\s7a028538a7].
-D 2023-05-05T14:14:10.402
+C Updates\sto\scompile-time\soption\susage\sand\sespecially\sto\sthe\scompile-time\soption\ntest\sscript\sin\stool/omittest.tcl.
+D 2023-05-05T14:16:31.991
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -577,7 +577,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c 1949007d2792cf761799348b3760c8489d1964c49efa9e52591aa1f2fcdbc96f
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h a9ae91868acc4b3146d47ae2a072aac2cf41ecb7386015752160c8e1a212d9f2
-F src/build.c 8357d6ca9a8c9afc297c431df28bc2af407b47f3ef2311875276c944b30c4d54
+F src/build.c 7a7217f75f202eff03617ca447bb9c3bc07d5af49da1d3cff2b1a88e8e394686
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
@@ -588,7 +588,7 @@ F src/delete.c a9c6d3f51c0a31e9b831e0a0580a98d702904b42d216fee530940e40dec34873
 F src/expr.c 871cfd80c516ee39d90414b2d3da2b5bc9c9e21fe87b7eb787ea7ae4b6461758
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 03c134cc8bffe54835f742ddea0b72ebfc8f6b32773d175c71b8afeea6cb5c83
-F src/func.c d187be57a886ddf4e6b7ef584a494361899be3df5eee6d4a747b68ff4aff4122
+F src/func.c 03e6b501f3056d0ba398bda17df938b2b566aa0b3ca7e1942a3cd1925d04ec36
 F src/global.c bd0892ade7289f6e20bff44c07d06371f2ff9b53cea359e7854b9b72f65adc30
 F src/hash.c c6af5f96a7a76d000f07c5402c48c318c2566beecdee9e78b9d9f60ce7119565
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
@@ -635,7 +635,7 @@ F src/printf.c 19a25adf1b73892d41af7d8f7cbc55b01b592bf2062e68b9f10e604d8deee7e0
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c f879cef11c462a2c37a8c906932781e384c3bb32042c355a704a043029c90d27
+F src/select.c f9333ef8181192c22662f5cb8d257efc4a2880f9ee4853c6c4616f783d27e1b5
 F src/shell.c.in 39ea3d9c17c65c42c6c415222d89a32ae683b245c8af7b4bfc544d9246055d16
 F src/sqlite.h.in 27ca1d4b2eda8feee468af5735182390e8fe4696522751eec0136d17323201ad
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2010,7 +2010,7 @@ F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
 F tool/omittest-msvc.tcl d6b8f501ac1d7798c4126065030f89812379012cad98a1735d6d7221492abc08
-F tool/omittest.tcl 3bc9609aceea871e1ca6ed6749df9ce79b89369d22b492f6ce6078f40647cc3f
+F tool/omittest.tcl e99c9fecc3f7a8ca2fa75d8ec8bdbb5acce33dc69f0c280aae53064693387f65
 F tool/opcodesum.tcl 740ed206ba8c5040018988129abbf3089a0ccf4a
 F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
 F tool/replace.tcl 937c931ad560688e85bdd6258bdc754371bb1e2732e1fb28ef441e44c9228fce
@@ -2068,8 +2068,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a17106494a8a67bc92cfe27ee8ef9bf160517d6930d796980ae12287b98c1cfe
-R e3a4bf4875d701cb67328bbeeca5b714
+P a77c8a780f884d0cb01d20912cf1aeec0bb7f3999d23117fe5bd82bc4405d483
+R 74f98f7cc72d3aae8c89e24d9fb2e559
 U drh
-Z d618217c755710ff423f44b11a904f24
+Z cacd26f295de4dcda9a986aaebe10401
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8cac292a6abf3e313c7d8a3fa455f22d9f6d015b..23d0ab04b278eb8a2e92546c1c92cbe1fc6b6b0f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a77c8a780f884d0cb01d20912cf1aeec0bb7f3999d23117fe5bd82bc4405d483
\ No newline at end of file
+fece588b186c4f9f76d626313e35336fd5681e966e9bd0fa1053b147c4e3c315
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index eecfa4705b06559865eab8444735e41e765aac3a..9be444c3c36d457ad58b489b043c672074121db2 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -848,7 +848,7 @@ static void SQLITE_NOINLINE deleteTable(sqlite3 *db, Table *pTable){
   if( IsOrdinaryTable(pTable) ){
     sqlite3FkDelete(db, pTable);
   }
-#ifndef SQLITE_OMIT_VIRTUAL_TABLE
+#ifndef SQLITE_OMIT_VIRTUALTABLE
   else if( IsVirtual(pTable) ){
     sqlite3VtabClear(db, pTable);
   }

diff --git a/src/func.c b/src/func.c
index 045c60613bb4238cf7cfe7436a90016e6ec99159..4d0da5deddb082a276dd1876f0d406d22198f412 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -1518,7 +1518,7 @@ static void trimFunc(
 /*
 ** The "unknown" function is automatically substituted in place of
 ** any unrecognized function name when doing an EXPLAIN or EXPLAIN QUERY PLAN
-** when the SQLITE_ENABLE_UNKNOWN_FUNCTION compile-time option is used.
+** when the SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION compile-time option is used.
 ** When the "sqlite3" command-line shell is built using this functionality,
 ** that allows an EXPLAIN or EXPLAIN QUERY PLAN for complex queries
 ** involving application-defined functions to be examined in a generic

diff --git a/src/select.c b/src/select.c
index 1f4b879bd6a33ff2b49f85bd345223096c348923..6be3b6a556cdc95c22c88a66538025d319cbf6ce 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -717,7 +717,7 @@ static void pushOntoSorter(
   **   (2) All output columns are included in the sort record.  In that
   **       case regData==regOrigData.
   **   (3) Some output columns are omitted from the sort record due to
-  **       the SQLITE_ENABLE_SORTER_REFERENCE optimization, or due to the
+  **       the SQLITE_ENABLE_SORTER_REFERENCES optimization, or due to the
   **       SQLITE_ECEL_OMITREF optimization, or due to the 
   **       SortCtx.pDeferredRowLoad optimiation.  In any of these cases
   **       regOrigData is 0 to prevent this routine from trying to copy

diff --git a/tool/omittest.tcl b/tool/omittest.tcl
index b54f2984d414b9e1f06176da29254323de9121dc..8862c685f8807a6c86b8b3625ffbc535ad83a444 100644 (file)
--- a/tool/omittest.tcl
+++ b/tool/omittest.tcl
@@ -192,9 +192,9 @@ proc main {argv} {
     SQLITE_OMIT_AUTOMATIC_INDEX \
     SQLITE_OMIT_AUTORESET \
     SQLITE_OMIT_AUTOVACUUM \
+    SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS \
     SQLITE_OMIT_BETWEEN_OPTIMIZATION \
     SQLITE_OMIT_BLOB_LITERAL \
-    SQLITE_OMIT_BTREECOUNT \
     SQLITE_OMIT_CASE_SENSITIVE_LIKE_PRAGMA \
     SQLITE_OMIT_CAST \
     SQLITE_OMIT_CHECK \
@@ -225,7 +225,7 @@ proc main {argv} {
     SQLITE_OMIT_LOOKASIDE \
     SQLITE_OMIT_MEMORYDB \
     SQLITE_OMIT_OR_OPTIMIZATION \
-    SQLITE_OMIT_PAGER_PRAGMAS \
+    SQLITE_OMIT_PAGER_PRAGMAS  \
     SQLITE_OMIT_PARSER_TRACE \
     SQLITE_OMIT_POPEN \
     SQLITE_OMIT_PRAGMA \
@@ -244,8 +244,9 @@ proc main {argv} {
     SQLITE_OMIT_TRACE \
     SQLITE_OMIT_TRIGGER \
     SQLITE_OMIT_TRUNCATE_OPTIMIZATION \
+    SQLITE_OMIT_TWOSIZE_LOOKASIDE \
     SQLITE_OMIT_UPSERT \
-    SQLITE_OMIT_UTF16 \
+    SQLITE_OMIT_UTF \
     SQLITE_OMIT_VACUUM \
     SQLITE_OMIT_VIEW \
     SQLITE_OMIT_VIRTUALTABLE \
@@ -258,24 +259,69 @@ proc main {argv} {
   set ::ENABLE_SYMBOLS [list \
     SQLITE_ALLOW_ROWID_IN_VIEW \
     SQLITE_DISABLE_DIRSYNC \
+    SQLITE_DISABLE_FTS \
+    SQLITE_DISABLE_INTRINSIC \
     SQLITE_DISABLE_LFS \
+    SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS \
+    SQLITE_DISABLE_SKIPAHEAD_DISTINCT \
+    SQLITE_ENABLE_API_ARMOR \
     SQLITE_ENABLE_ATOMIC_WRITE \
+    SQLITE_ENABLE_BATCH_ATOMIC_WRITE \
+    SQLITE_ENABLE_BYTECODE_VTAB \
+    SQLITE_ENABLE_CEROD \
     SQLITE_ENABLE_COLUMN_METADATA \
+    SQLITE_ENABLE_COLUMN_USED_MASK \
+    SQLITE_ENABLE_COMMENTS \
+    SQLITE_ENABLE_CORRUPT_PGNO \
+    SQLITE_ENABLE_COSTMULT \
+    SQLITE_ENABLE_CURSOR_HINTS \
+    SQLITE_ENABLE_DBPAGE_VTAB \
+    SQLITE_ENABLE_DBSTAT_VTAB \
     SQLITE_ENABLE_EXPENSIVE_ASSERT \
-    SQLITE_ENABLE_FTS3 \
-    SQLITE_ENABLE_FTS3_PARENTHESIS \
-    SQLITE_ENABLE_FTS4 \
+    SQLITE_ENABLE_EXPLAIN_COMMENTS \
+    SQLITE_ENABLE_FTS \
+    SQLITE_ENABLE_GEOPOLY \
+    SQLITE_ENABLE_HIDDEN_COLUMNS \
+    SQLITE_ENABLE_ICU \
+    SQLITE_ENABLE_ICU_COLLATIONS \
+    SQLITE_ENABLE_INTERNAL_FUNCTIONS \
     SQLITE_ENABLE_IOTRACE \
     SQLITE_ENABLE_LOAD_EXTENSION \
     SQLITE_ENABLE_LOCKING_STYLE \
+    SQLITE_ENABLE_MATH_FUNCTIONS \
     SQLITE_ENABLE_MEMORY_MANAGEMENT \
-    SQLITE_ENABLE_MEMSYS3 \
-    SQLITE_ENABLE_MEMSYS5 \
+    SQLITE_ENABLE_MEMSYS \
+    SQLITE_ENABLE_MODULE_COMMENTS \
+    SQLITE_ENABLE_MULTIPLEX \
+    SQLITE_ENABLE_MULTITHREADED_CHECKS \
+    SQLITE_ENABLE_NORMALIZE \
+    SQLITE_ENABLE_NULL_TRIM \
+    SQLITE_ENABLE_OFFSET_SQL_FUNC \
     SQLITE_ENABLE_OVERSIZE_CELL_CHECK \
+    SQLITE_ENABLE_PREUPDATE_HOOK \
+    SQLITE_ENABLE_QPSG \
+    SQLITE_ENABLE_RBU \
     SQLITE_ENABLE_RTREE \
-    SQLITE_ENABLE_STAT3 \
+    SQLITE_ENABLE_SELECTTRACE \
+    SQLITE_ENABLE_SESSION \
+    SQLITE_ENABLE_SETLK_TIMEOUT \
+    SQLITE_ENABLE_SNAPSHOT \
+    SQLITE_ENABLE_SORTER_MMAP\
+    SQLITE_ENABLE_SORTER_REFERENCE \
+    SQLITE_ENABLE_SORTER_REFERENCES \
+    SQLITE_ENABLE_SQLLOG\
+    SQLITE_ENABLE_STAT \
+    SQLITE_ENABLE_STMT_SCANSTATUS \
+    SQLITE_ENABLE_STMTVTAB \
+    SQLITE_ENABLE_TREETRACE \
+    SQLITE_ENABLE_UNKNOWN_FUNCTION \
+    SQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
     SQLITE_ENABLE_UNLOCK_NOTIFY \
     SQLITE_ENABLE_UPDATE_DELETE_LIMIT \
+    SQLITE_ENABLE_URI_00_ERROR \
+    SQLITE_ENABLE_VFSTRACE \
+    SQLITE_ENABLE_WHERETRACE \
+    SQLITE_ENABLE_ZIPVFS \
   ]
 
   # Process any command line options.