From: dan <Dan Kennedy>
Date: Tue, 13 Jul 2021 11:30:46 +0000 (+0000)
Subject: Do not attempt to run Tcl sessions tests unless both SQLITE_ENABLE_PREUPDATE_HOOK... 
X-Git-Tag: version-3.37.0~340
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1cacb76b74a9e1f207e21fa6f15cbb15d6ec9fa;p=thirdparty%2Fsqlite.git

Do not attempt to run Tcl sessions tests unless both SQLITE_ENABLE_PREUPDATE_HOOK and SQLITE_ENABLE_SESSIONS are defined.

FossilOrigin-Name: 385db794477e046b5dde726489375786d7565b113084f6e730efb050b08f9a6e
---

diff --git a/manifest b/manifest
index a354ffea57..0657e74438 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarify\scomment\son\ssqlite3.h's\sinterface\sdecaration\smacros.
-D 2021-07-09T23:12:42.486
+C Do\snot\sattempt\sto\srun\sTcl\ssessions\stests\sunless\sboth\sSQLITE_ENABLE_PREUPDATE_HOOK\sand\sSQLITE_ENABLE_SESSIONS\sare\sdefined.
+D 2021-07-13T11:30:46.013
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -569,7 +569,7 @@ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
 F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857
 F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce
 F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
-F src/test_config.c 9c8e12823c46082a01765addf43be9309889f4e9dfb5a512a6c974e1c4efb413
+F src/test_config.c 284c29912736f68b0a583a920bf63fd8f9125dffb8a75cb0676e58502b2f7908
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
 F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
@@ -1920,7 +1920,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 ab1550a608684b6b9104b555a975482cfabca5053b7d7dcc60d63a0e3a8d707d
-R ccb396cfbaef0a2b4107a89e839d38ef
-U larrybr
-Z 05b6e9c94023ac4e996b4a1256a4c2d0
+P 7cb09aef49c0b98c0c5e332d953a2eeb71ae9e243b1e37ab1c8ed4af15d46f50
+R ffe5fcedbe611fc5d143174623ac9c96
+U dan
+Z 4dfdb08b45660ff4713e22026b265656
diff --git a/manifest.uuid b/manifest.uuid
index 44b147f611..713c3371de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7cb09aef49c0b98c0c5e332d953a2eeb71ae9e243b1e37ab1c8ed4af15d46f50
\ No newline at end of file
+385db794477e046b5dde726489375786d7565b113084f6e730efb050b08f9a6e
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index 86e4df38f7..acf98e36d8 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -589,7 +589,7 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
   Tcl_SetVar2(interp, "sqlite_options", "schema_version", "1", TCL_GLOBAL_ONLY);
 #endif
 
-#ifdef SQLITE_ENABLE_SESSION
+#if defined(SQLITE_ENABLE_SESSION) && defined(SQLITE_ENABLE_PREUPDATE_HOOK)
   Tcl_SetVar2(interp, "sqlite_options", "session", "1", TCL_GLOBAL_ONLY);
 #else
   Tcl_SetVar2(interp, "sqlite_options", "session", "0", TCL_GLOBAL_ONLY);