Fix tests cases for SQLITE_ENABLE_SHARED_CACHE so that they work on Windows.

FossilOrigin-Name: 60795a30c64dbaa3be16dc35a39262b5487a5d4abcff20ae8973e12b73af5af2

diff --git a/manifest b/manifest
index 43caf29fcceb46c178aebd1c7dcf08d1cbeb6e88..8c86ddc03ef2ba4e8d71201b9d07097af829e47e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sall\sthe\slatest\strunk\senhancements\sinto\sthe\sreuse-schema\sbranch.
-D 2024-08-29T17:42:01.950
+C Fix\stests\scases\sfor\sSQLITE_ENABLE_SHARED_CACHE\sso\sthat\sthey\swork\son\sWindows.
+D 2024-08-29T19:37:21.055
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1555,13 +1555,13 @@ F test/resetdb.test 54c06f18bc832ac6d6319e5ab23d5c8dd49fdbeec7c696d791682a8006bd
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/returning1.test 212cd4111bb941a60abf608f20250db666c21eb1bc4d49217e96c87ff3ab9d1a
 F test/returningfault.test ae4c4b5e8745813287a359d9ccdb9d5c883c2e68afb18fb0767937d5de5692a4
-F test/reuse1.test faa2ce5ff566d936b8a10d9e22ba2ee66a54ce89fdcf8aef561df6b15b0ff3d3
-F test/reuse2.test 025d54dcbf5bb32a869ffde4884789af2ec4a302b7dc4550dfbd16e635a3dd65
-F test/reuse3.test fa1edd6a303bbb93aa076d6579fce9d2ee2d9e1a8f4d7b613ac20a76ba622eaa
-F test/reuse4.test adaad66253aea6cc748674328abe69b650c5c78b8676ed1162d3de09742519f9
+F test/reuse1.test b5359932592b25d2178cd1ce0cd837abb25b68aaf69c4812eb83efa490c2dd19
+F test/reuse2.test 4012db85142e2abe3d8a1186756a71ea6e7078091f7448ac2145ca7b8c18cc51
+F test/reuse3.test 890074bbfc31f71762d583ee23a22c647870b2c2e91eb1eb60c2b5a5d3d8986b
+F test/reuse4.test bf36ee3848534f64234f84389fe8f2289da353cc0535cfe62b9287e32786f755
 F test/reuse5.test bbe6cf7384ef90f134392edd93d626385ef0bf6f40eefc3d993535cd0861d83b
 F test/reuse6.test f4674f9967aee2a0b49c02832120b8b495291c0d87aae084c54e6c0cc18132fe
-F test/reusefault.test ef646a0fb51d50ddfb4b7cd872f88e7d36eaba64bde7797b3418c3774e1c8d14
+F test/reusefault.test 545a21be1b80b8ccab02c3695137ab2bb1fc58ac78738b5bf33348a618ee3b2e
 F test/rollback.test 952c4d805bca96adc2be76f621ea22115fe40b330015af36fcc8028c8547fcee
 F test/rollback2.test 3f3a4e20401825017df7e7671e9f31b6de5fae5620c2b9b49917f52f8c160a8f
 F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
@@ -2221,8 +2221,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 31a71a79bf9bd4737bf4a266056c7a4f4796c9bcc19e35e3f94e1235585cae9d e042eb024738a83eed92cd2dfac3d2a50d2589715a3d81b1a494564dd7d8e7fa
-R dda929dd6616efad6c1f53ddca33f46d
+P 87aa6fc2121951cebf4e31b204c9e152359c274a9467cb8f76becbc601cf173e
+R d469253a658afd77b0fd377d603fbf26
 U drh
-Z 6411120ed31bd9d5856a418733d141ac
+Z 525dbfc62ae8437d80889e7e15a1cc65
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 441d301568be6dd281e15f9c0d806294718b0982..325cfc58081ae0808e79fd8112a862f218d51c9a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87aa6fc2121951cebf4e31b204c9e152359c274a9467cb8f76becbc601cf173e
+60795a30c64dbaa3be16dc35a39262b5487a5d4abcff20ae8973e12b73af5af2

diff --git a/test/reuse1.test b/test/reuse1.test
index 5fcd3a47a83106699313350381ab4643735fe0f4..4b12b3c2f7e5dfe99de865f335cbd7d6e685f1d8 100644 (file)
--- a/test/reuse1.test
+++ b/test/reuse1.test
@@ -98,6 +98,8 @@ foreach {tn sql} {
 
 #-------------------------------------------------------------------------
 #
+db2 close
+db3 close
 reset_db
 forcedelete test.db2
 ifcapable fts5 {
@@ -390,5 +392,3 @@ do_execsql_test 7.4 {
 
 
 finish_test
-
-

diff --git a/test/reuse2.test b/test/reuse2.test
index f91e907a90b84c416dfcb341ea1b626324652c2b..2a0845cfc03bfac5d50652e0939043cfa1184398 100644 (file)
--- a/test/reuse2.test
+++ b/test/reuse2.test
@@ -47,6 +47,7 @@ do_execsql_test 1.3.3 {
 } {1 2 3 4 5 6}
 
 #--------------------------------------------------------------------------
+db2 close
 reset_db
 ifcapable fts5 {
   do_execsql_test 2.0 {
@@ -333,4 +334,3 @@ do_execsql_test -db db2 5.2.4 {
 } {ok nref=6 nschema=1 ndelete=5}
 
 finish_test
-

diff --git a/test/reuse3.test b/test/reuse3.test
index 1652cb1a4dc0d9d61586f7340f9abd8b3d9e94c7..303bc062f5ff434d433ee1a6307afc1f99399806 100644 (file)
--- a/test/reuse3.test
+++ b/test/reuse3.test
@@ -312,6 +312,8 @@ do_execsql_test 5.6.10 {
 } {nref=2 nschema=1}
 
 #-------------------------------------------------------------------------
+db2 close
+db3 close
 reset_db
 do_execsql_test 6.0 {
   CREATE TABLE t1(a, b);
@@ -352,4 +354,3 @@ do_test 6.4 {
 } "#/$N1 $N1/"
 
 finish_test
-

diff --git a/test/reuse4.test b/test/reuse4.test
index 3635bc61fda2286c3096a1a97b65333b21c1a773..a3a2d0aa6f0adb67d147b9dfacb673527778dc62 100644 (file)
--- a/test/reuse4.test
+++ b/test/reuse4.test
@@ -24,6 +24,7 @@ foreach {tn sharedschema} {
   1 0  
   2 1  
 } {
+  catch {db2 close}
   reset_db
 
   do_execsql_test 1.$tn.0 {
@@ -123,6 +124,7 @@ foreach {tn sharedschema} {
 #-------------------------------------------------------------------------
 # Test some PRAGMA statements with shared-schema connections.
 #
+db2 close
 reset_db
 do_execsql_test 2.0 {
   CREATE TABLE t1(a, b, c);
@@ -170,4 +172,3 @@ foreach {tn pragma nSchema nDelete} {
 }
 
 finish_test
-

diff --git a/test/reusefault.test b/test/reusefault.test
index 66699f8f6be79ad570802eac35b7a2b6f2d6bf80..b03d5765a3c66f5613c59829c6f7e6ba58b3ebd0 100644 (file)
--- a/test/reusefault.test
+++ b/test/reusefault.test
@@ -28,6 +28,7 @@ do_execsql_test 1.0 {
 faultsim_save_and_close
 
 do_faultsim_test 1.1 -prep {
+  catch {db close}
   faultsim_restore
   sqlite3 db test.db -shared-schema 1
 } -body {
@@ -37,6 +38,8 @@ do_faultsim_test 1.1 -prep {
 }
 
 do_faultsim_test 1.2 -prep {
+  catch {db close}
+  catch {db2 close}
   faultsim_restore
   sqlite3 db test.db -shared-schema 1
   execsql { SELECT * FROM t1 }
@@ -51,4 +54,3 @@ do_faultsim_test 1.2 -prep {
 
 
 finish_test
-