From: drh <>
Date: Wed, 13 Mar 2024 16:49:36 +0000 (+0000)
Subject: Do not automatically activate SQLITE_ENABLE_SHARED_SCHEMA in the
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=739a4244a6344add6637ea8da18d8284fc3dcc9b;p=thirdparty%2Fsqlite.git

Do not automatically activate SQLITE_ENABLE_SHARED_SCHEMA in the
Makefile.  Instead, enhance the mdevtest and sdevtest targets of
testrunner.tcl to set that option sometimes and sometimes not.

FossilOrigin-Name: 693b8f9307fc9d3e00f2a573329f054709ad916a570773c986d32524b4d7522e
---

diff --git a/Makefile.in b/Makefile.in
index f6b06e6b4f..d198fdceea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,7 +141,6 @@ GCOV_LDFLAGS1 = -lgcov
 USE_GCOV = @USE_GCOV@
 LTCOMPILE_EXTRAS += $(GCOV_CFLAGS$(USE_GCOV))
 LTLINK_EXTRAS += $(GCOV_LDFLAGS$(USE_GCOV))
-LTCOMPILE_EXTRAS += -DSQLITE_ENABLE_SHARED_SCHEMA
 
 
 # The directory into which to store package information for
diff --git a/manifest b/manifest
index 046184d90c..f972c909f7 100644
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Merge\sthe\stestrunner.tcl\senhancement\sfrom\strunk.
-D 2024-03-13T16:35:12.158
+C Do\snot\sautomatically\sactivate\sSQLITE_ENABLE_SHARED_SCHEMA\sin\sthe\nMakefile.\s\sInstead,\senhance\sthe\smdevtest\sand\ssdevtest\stargets\sof\ntestrunner.tcl\sto\sset\sthat\soption\ssometimes\sand\ssometimes\snot.
+D 2024-03-13T16:49:36.651
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in a0eb3db43e29856dcfdd7e6c468b8818f26d6146fbabdd196a3c03c1c5de99b1
+F Makefile.in da128eae24b56cbbf05e131d3342323846ea62a534a964d32fb7f06ae974f89f
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc a6f772c667c3a967c1a65b8f7bf1502b73001052567b5c7702cde8dc80f2568b
 F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
@@ -1696,8 +1696,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl ad2bf61b6676442e106c147f6d8b3735a61478f7c6ee9916178139efafc39232
-F test/testrunner.tcl 9f198e41c0d8899d547a5beb4af0c0d512021d18da136918dd96be6a242dbab5
-F test/testrunner_data.tcl 2f94974e5e3a56af880be72f7a7fd239aa9d4ecf978625435fcc698319c927fa
+F test/testrunner.tcl 841b082df19abd3d482f893c82a7795401539ba8f0df321290e5f4392cd167a6
+F test/testrunner_data.tcl 140b7201874bb2c98ed413f2c7f7beb069a6ef7b5fa619e9b458e20822f09110
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2187,8 +2187,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 70ef3784f678e29a7b067e557f69ca0a14e7823c344bb438dc4373a454389218 9349d94e05dcf266b02afcd89f1e433cdc45f23e8536b2f3f9aa242d5d89c307
-R 1dcb524ed8de4d012de520fdb42be160
+P da47151561fb7045dbfe9967b27c10bfd754bc88f537c43f5e3739b52b703f72
+R f9ddc79a6ef5671bab269c8fc35a39f2
 U drh
-Z b137403d151f1954ec1dd428867a4371
+Z 28013b67504b9c056878bcc413a4fa76
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a11c2772b8..91c8e48e5e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da47151561fb7045dbfe9967b27c10bfd754bc88f537c43f5e3739b52b703f72
\ No newline at end of file
+693b8f9307fc9d3e00f2a573329f054709ad916a570773c986d32524b4d7522e
\ No newline at end of file
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index e8d0f76864..c194e353ec 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -886,7 +886,8 @@ proc add_jobs_from_cmdline {patternlist} {
 
     mdevtest {
       set config_set {
-        All-O0
+        ReuseSchema-O0
+        ReuseSchema-Debug
         All-Debug
       }
       add_devtest_jobs $config_set [lrange $patternlist 1 end]
@@ -894,7 +895,7 @@ proc add_jobs_from_cmdline {patternlist} {
 
     sdevtest {
       set config_set {
-        All-Sanitize
+        ReuseSchema-Sanitize
         All-Debug
       }
       add_devtest_jobs $config_set [lrange $patternlist 1 end]
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index f38abad589..d1984976b8 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -103,6 +103,18 @@ namespace eval trd {
     --enable-all -fsanitize=address,undefined -fno-sanitize-recover=undefined
   }
 
+  set build(ReuseSchema-Debug) {
+    --enable-debug --enable-all -DSQLITE_ENABLE_SHARED_SCHEMA
+  }
+  set build(ReuseSchema-O0) {
+    -O0 --enable-all -DSQLITE_ENABLE_SHARED_SCHEMA
+  }
+  set build(ReuseSchema-Sanitize) { 
+    -DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_SHARED_SCHEMA
+    --enable-all -fsanitize=address,undefined -fno-sanitize-recover=undefined
+  }
+
+
   set build(Sanitize) {
     CC=clang -fsanitize=address,undefined -fno-sanitize-recover=undefined
     -DSQLITE_ENABLE_STAT4