From: dan <Dan Kennedy>
Date: Wed, 10 Mar 2021 10:43:17 +0000 (+0000)
Subject: Fix a problem preventing wapptest from setting SQLITE_ENABLE_LOCKING_STYLE for OSX... 
X-Git-Tag: version-3.35.0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1c467f51fafc227167da493b365be0f7024cbbd;p=thirdparty%2Fsqlite.git

Fix a problem preventing wapptest from setting SQLITE_ENABLE_LOCKING_STYLE for OSX tests. Also modify the "Sanitize" configuration in releasetest_data.tcl to subsume test item 6g.

FossilOrigin-Name: f762d7df2a41a88560a4251d744e0887f42812f8160af4f0129d22a71c0fa48b
---

diff --git a/manifest b/manifest
index 3541aaf6c5..e3b6a4c430 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sshell\shas\sno\s.ar,\sfake\sits\seffect\sw.r.t.\spage_size\sand\stable\screation/filling.
-D 2021-03-10T06:06:16.491
+C Fix\sa\sproblem\spreventing\swapptest\sfrom\ssetting\sSQLITE_ENABLE_LOCKING_STYLE\sfor\sOSX\stests.\sAlso\smodify\sthe\s"Sanitize"\sconfiguration\sin\sreleasetest_data.tcl\sto\ssubsume\stest\sitem\s6g.
+D 2021-03-10T10:43:17.298
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1292,7 +1292,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
 F test/releasetest.tcl fb76d8fcc95ac29d6356cd9e52b726ab9e43a24082897618dfbcb7c2b0049153 x
-F test/releasetest_data.tcl d60628b6a04891e97cc4f5fbce08abe13c5b74cb23dcca5ac24800471a3bc6db
+F test/releasetest_data.tcl 3d41ddb3f04f474ac9d925485da24ce6576ff0ebc4c7201c8a340bc09846c261
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/returning1.test 209b910c132cb2015bb1159f852c7124778004963c09095c42c3d2442110c56c
@@ -1910,7 +1910,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a6681fbb2e0c8d5a7c968f6fd458f61658fad6ac4c7eb8663762b6ac386cdae5
-R c5255ad6d706f59a1204e6271021ef44
-U larrybr
-Z 6ffa18aa5b815a92fb54091eda0e7ca8
+P 959f5c65ea14f4716df61e250e9d5a0d69d602a2a973ad22a364e640162c2983
+R d626d3a5efcce27f8b2b558d85869041
+U dan
+Z 1b9ef75646145da6a8ad40b41fd55ca0
diff --git a/manifest.uuid b/manifest.uuid
index 1034326473..01ec7c4d1d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-959f5c65ea14f4716df61e250e9d5a0d69d602a2a973ad22a364e640162c2983
\ No newline at end of file
+f762d7df2a41a88560a4251d744e0887f42812f8160af4f0129d22a71c0fa48b
\ No newline at end of file
diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl
index 5aa27f6e6e..b753259c58 100644
--- a/test/releasetest_data.tcl
+++ b/test/releasetest_data.tcl
@@ -283,7 +283,7 @@ array set ::Configs [strip_comments {
   FuzzFail2 {-O0}
 }]
 if {$tcl_platform(os)=="Darwin"} {
-  lappend Configs(Apple -DSQLITE_ENABLE_LOCKING_STYLE=1
+  lappend Configs(Apple) -DSQLITE_ENABLE_LOCKING_STYLE=1
 }
 
 array set ::Platforms [strip_comments {
@@ -302,7 +302,7 @@ array set ::Platforms [strip_comments {
     "No-lookaside"            test
     "Devkit"                  test
     "Apple"                   test
-    "Sanitize"                {QUICKTEST_OMIT=crash*,shell*,sqldiff*,sessionB.test test}
+    "Sanitize"                test
     "Device-One"              fulltest
     "Default"                 "threadtest fulltest"
     "Valgrind*"               valgrindtest
@@ -355,6 +355,14 @@ array set ::Platforms [strip_comments {
   }
 }]
 
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+# End of configuration section.
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+#--------------------------------------------------------------------------
+
 # Configuration verification: Check that each entry in the list of configs
 # specified for each platforms exists.
 #