Fix recent test case changes so that they also work on Windows.

FossilOrigin-Name: 38578b5af2e97c420f3106bc486318604aecbaa327365bbc2e9518be84491495

diff --git a/manifest b/manifest
index 462d7295e398ba59fc914901a7b065cca5d06942..9250890ce060857728d6380c21314dfab1a2a66c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sSQLITE_CONSTRAINT\sreturn\svalue\sfrom\sxBestIndex\sto\sprohibit\sbad\nquery\splans\sin\sthe\spragma\svirtual\stable.
-D 2024-03-25T11:34:42.948
+C Fix\srecent\stest\scase\schanges\sso\sthat\sthey\salso\swork\son\sWindows.
+D 2024-03-25T12:28:06.030
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1501,7 +1501,7 @@ F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b76
 F test/pragma.test 8bb6d3992c1c31ff6d5553d1e0693d642f7e19015648c6ae7034cb497d26bbd4
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
-F test/pragma4.test 1951dc5a6d87c4ccd8eab35c65f18380c80fac4a0897e828cf518e3cc8a4c292
+F test/pragma4.test d864430507fc5628c150f1e50c1d128a444ccf8dab39b5465644f53fa4232311
 F test/pragma5.test 7b33fc43e2e41abf17f35fb73f71b49671a380ea92a6c94b6ce530a25f8d9102
 F test/pragma6.test c5ec577ba087954b4dfa619a3cbe97b155b60a0af487527abe89b10fc17e6512
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
@@ -1522,7 +1522,7 @@ F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-F test/readonly.test bdf5a451f415bc3153764122d034f553797c27194ffbd1e9763ecd9500af41d2
+F test/readonly.test c1985f0b4ab55041f2ba629dadc6578a3ff0f0e5b0ec7912e85c51f49c3e82fe
 F test/recover.test 6463509a7404e0c35431dd9b4a1c3b4a29d7a6af8a08462b31670c8a5a616d3a
 F test/regexp1.test 8f2a8bc1569666e29a4cee6c1a666cd224eb6d50e2470d1dc1df995170f3e0f1
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
@@ -2182,8 +2182,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 92e9a71bc4daa261d7c9a81fb66f7d7c0f0a74eb9e0c9dec8b4651acc5217bff
-R 7a45ef8d7654e3d4a6dd224e77e73806
+P b1259d4448f744861e416f42328c1450854370e5c77102d2a5abe5cf6c7f12bd
+R 8e93d8f33bb14264477f8796f06f56d6
 U drh
-Z d7913bb9141ded55d9621342d895b371
+Z 14ed6a8037fd4481b1dadac4489cca1e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 81c9591139c010d4a5c6708aafaa157f1fa04384..ca79f423a7c14b75c7329e8fb04bec99078e0efb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b1259d4448f744861e416f42328c1450854370e5c77102d2a5abe5cf6c7f12bd
\ No newline at end of file
+38578b5af2e97c420f3106bc486318604aecbaa327365bbc2e9518be84491495
\ No newline at end of file

diff --git a/test/pragma4.test b/test/pragma4.test
index 9b2fa9ba2a0ca90cd9eab0d06230ac3ebd495a98..7c244c78b6fa023c46561d86e9cd7611dd01bb92 100644 (file)
--- a/test/pragma4.test
+++ b/test/pragma4.test
@@ -83,7 +83,7 @@ foreach {tn sql} {
 # Verify that that P4_INTARRAY argument to OP_IntegrityCk is rendered
 # correctly.
 #
-db close
+catch {db close}
 forcedelete test.db
 sqlite3 db test.db
 do_test pragma4-2.100 {
@@ -266,8 +266,12 @@ do_execsql_test 5.0 {
 
 # 2024-03-24 https://sqlite.org/forum/forumpost/85b6a8b6705fb77a
 #
+catch {db2 close}
+catch {db3 close}
 reset_db
 do_execsql_test 6.0 {
+  DROP TABLE IF EXISTS t1;
+  DROP TABLE IF EXISTS t2;
   CREATE TABLE t1(a INT PRIMARY KEY, b INT);
   CREATE TABLE t2(c INT PRIMARY KEY, d INT REFERENCES t1);
   SELECT t.name, f."table", f."from", i.name, i.pk

diff --git a/test/readonly.test b/test/readonly.test
index 811d54f3b5faa38377069bbf1bbf9de969543bce..1ccbcee284174ddbdf270496a81d41caf36ef387 100644 (file)
--- a/test/readonly.test
+++ b/test/readonly.test
@@ -15,6 +15,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+if {$tcl_platform(platform)=="windows"} finish_test
 source $testdir/lock_common.tcl
 source $testdir/wal_common.tcl
 set ::testprefix readonly