Fix some test cases on Windows.

FossilOrigin-Name: d2d6363f31ecbae353a1e80810f42d9e2f0f8db0fe6294c7deadf0c58669b9d0

diff --git a/manifest b/manifest
index cabee6f7a25a35fd8a6a72726a8317cd928ffa8d..8959e05f835943f494c3b2e00d60dff72037ff1b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sBloom-filter\ssupport\sso\sthat\sit\sworks\swith\sblob\svalues\sand\swith\ntext\svalues\sas\slong\sas\sthe\scollating\ssequence\sis\sbinary.
-D 2026-07-23T21:34:16.953
+C Fix\ssome\stest\scases\son\sWindows.
+D 2026-07-24T00:39:41.488

 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea


@@ -753,7 +753,7 @@ F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c dce1b8217ed34545d8ce04375f22dc05b3f04e124994bd110969d6267480c1b8
 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c dce1b8217ed34545d8ce04375f22dc05b3f04e124994bd110969d6267480c1b8
 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a

-F src/test1.c 35eab319190cb9dda4823d62a38296824de7a3e020207df11207c3df6606f773
+F src/test1.c f226403694e7273614de9550e41e6839106ee10988a2d37d8a25a94aa85f825f

 F src/test2.c a61ed01d9264a1db74ab42fbc981fc66165f85d5e3947e92be61a73e79ec4f2d
 F src/test3.c e3e5a073c516295ee33d8d7482b6a87b7f2073867478441efc35928ee0eb97a7
 F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
 F src/test2.c a61ed01d9264a1db74ab42fbc981fc66165f85d5e3947e92be61a73e79ec4f2d
 F src/test3.c e3e5a073c516295ee33d8d7482b6a87b7f2073867478441efc35928ee0eb97a7
 F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0


@@ -1125,7 +1125,7 @@ F test/extension01.test 5de412c66276105901c370770175003381fdcb0c4da7054fa43cf4a3
 F test/external_reader.test 6fdec43eeca23eb32faad1e95a4d1abc402bc8b3db70df12d6fc08a637f4a2b5
 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717
 F test/external_reader.test 6fdec43eeca23eb32faad1e95a4d1abc402bc8b3db70df12d6fc08a637f4a2b5
 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717

-F test/filectrl.test 3344987f143f3cb9914895dc63d9e9518a535ef1b1438d22caf3ba2fa76cc6da
+F test/filectrl.test 456666587472368efde815108050a51a8b008b927a5f5a25dacb8efb321baff2

 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
 F test/filter1.test 590f8ba9a0cd0823b80d89ac75c5ce72276189cef9225d2436adaf1ee87f3727
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
 F test/filter1.test 590f8ba9a0cd0823b80d89ac75c5ce72276189cef9225d2436adaf1ee87f3727
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8


@@ -1329,7 +1329,7 @@ F test/insert5.test 79f6b6efd0d3db5f4e3ff442300b7d9e7185adb345b29aacc3ea5a9c58ab
 F test/insertfault.test ac63d14ea3b49c573673a572f4014b9117383a03e497c58f308b5c776e4a7f74
 F test/instr.test 67ba309e9697c24a304e98a7c8f372456177dd4e32237d2a305e1e05f7bb79c2
 F test/instrfault.test 95e28efade652e6d51ae11b377088fe523a581a07ec428009e152a4dd0e0f44c
 F test/insertfault.test ac63d14ea3b49c573673a572f4014b9117383a03e497c58f308b5c776e4a7f74
 F test/instr.test 67ba309e9697c24a304e98a7c8f372456177dd4e32237d2a305e1e05f7bb79c2
 F test/instrfault.test 95e28efade652e6d51ae11b377088fe523a581a07ec428009e152a4dd0e0f44c

-F test/intarray.test 8e736961513f9d6298587402c03a15aa5fdfd2dc8e4543c30d1678cd38eb7f57
+F test/intarray.test 095e2a13ccb3a37735a4134c5bd3f2b46a21d1a02f6a8b61e9dc6a85adbefce3

 F test/intck01.sql cc67c49bb0dbffd8ede29d3e095ba2b758eaa3907eeeca3fd44048a01c4071d3
 F test/interrupt.test ac1ef50ec9ab8e4f0e17c47629f82539d4b22558904e321ed5abea2e6187da7a
 F test/interrupt2.test 7eaa40a975d950826cd56e6c37f0f0629adfa2d1a8d3333aff0ff7cf86069963
 F test/intck01.sql cc67c49bb0dbffd8ede29d3e095ba2b758eaa3907eeeca3fd44048a01c4071d3
 F test/interrupt.test ac1ef50ec9ab8e4f0e17c47629f82539d4b22558904e321ed5abea2e6187da7a
 F test/interrupt2.test 7eaa40a975d950826cd56e6c37f0f0629adfa2d1a8d3333aff0ff7cf86069963


@@ -1475,7 +1475,7 @@ F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test 73ea63ab43668313e2f8cc9ef9e9a966672c7934f3ce76926fbe991235d07d91
 F test/nockpt.test 3db354270fc63b6871eebd40285d4c55324fb27be629c958adbff6d7fcaa8e14
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
 F test/nan.test 73ea63ab43668313e2f8cc9ef9e9a966672c7934f3ce76926fbe991235d07d91
 F test/nockpt.test 3db354270fc63b6871eebd40285d4c55324fb27be629c958adbff6d7fcaa8e14
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e

-F test/normalize.test f23b6c5926c59548635fcf39678ac613e726121e073dd902a3062fbb83903b72
+F test/normalize.test 88ba50b75feaa16735ac780f675c9e111179f81da40e5e026ecb777664e18da2

 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
 F test/notify3.test 796c7b7157f55c93b4e672b724e9c923a6fc6aa72ac419379a623e2350472e22
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
 F test/notify3.test 796c7b7157f55c93b4e672b724e9c923a6fc6aa72ac419379a623e2350472e22


@@ -1899,7 +1899,7 @@ F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/tpch01.test 4479008f85f6f8f25f7ab2cb305d665752b4727fa28a8df3d8e0ad46520c62ff
 F test/trace.test a659a9862957f4789e37a92b3bf6d2caf5c86b02cdeefc41e850ae53acf6992a
 F test/trace2.test f5cb67ad3bc09e0c58e8cca78dfd0b5639259983
 F test/tpch01.test 4479008f85f6f8f25f7ab2cb305d665752b4727fa28a8df3d8e0ad46520c62ff
 F test/trace.test a659a9862957f4789e37a92b3bf6d2caf5c86b02cdeefc41e850ae53acf6992a
 F test/trace2.test f5cb67ad3bc09e0c58e8cca78dfd0b5639259983

-F test/trace3.test dfc937a317884667cf292cf099cec7db506441f5d362c38e2b55d82048948cda
+F test/trace3.test 0730bdc25fcd4e2af8f516b1e84946d993734729ed9b03da064c8dede91331ee

 F test/trans.test 45f6f9ab6f66a7b5744f1caac06b558f95da62501916906cf55586a896f9f439
 F test/trans2.test 62bd045bfc7a1c14c5ba83ba64d21ade31583f76
 F test/trans3.test 91a100e5412b488e22a655fe423a14c26403ab94
 F test/trans.test 45f6f9ab6f66a7b5744f1caac06b558f95da62501916906cf55586a896f9f439
 F test/trans2.test 62bd045bfc7a1c14c5ba83ba64d21ade31583f76
 F test/trans3.test 91a100e5412b488e22a655fe423a14c26403ab94


@@ -2217,9 +2217,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c

-P ba919ea1d4fe84526a4c844b3f901e5e8b1650dcdee647e4d46da2d33ced1710 98ced971bfd48aedf862fa0f8674744723e36eeda2ad600e91062fc8b7d9da9e
-R 26aac823ea150432800c10471be492a6
-T +closed 98ced971bfd48aedf862fa0f8674744723e36eeda2ad600e91062fc8b7d9da9e
+P a67bff640c9e4ffdf2f48c049eaf829b9e43d167a1055bf8780ff29c910bbade
+R 05fed42f7b71b411ba0dc3a1f12c01a6

 U drh
 U drh

-Z 2f108fd2bd38b326761c2c9967df2222
+Z a81899ab7267511ed7b67d3ce44513fa

 # Remove this line to create a well-formed Fossil manifest.
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9e08b4feac1fddbb9347a0c49374e2153ce2fc63..17346fb02acc4fb850daafd0572cc4ca4b2d32f8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a67bff640c9e4ffdf2f48c049eaf829b9e43d167a1055bf8780ff29c910bbade
+d2d6363f31ecbae353a1e80810f42d9e2f0f8db0fe6294c7deadf0c58669b9d0

diff --git a/src/test1.c b/src/test1.c
index 420988d55b3b8e28f010e359e4b2d9e2c21c7600..08f31ddb68d5c74b26fcdb3e787337611d1ee059 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -1127,7 +1127,9 @@ static void inttoptrFunc(
   int argc,
   sqlite3_value **argv
 ){
   int argc,
   sqlite3_value **argv
 ){

-  void *p = testStringToPointer((const char*)sqlite3_value_text(argv[0]));
+  unsigned char *p;
+  p = (unsigned char*)testStringToPointer(
+                           (const char*)sqlite3_value_text(argv[0]));

   if( argc==2 ){
     p += sqlite3_value_int(argv[1]);
   }
   if( argc==2 ){
     p += sqlite3_value_int(argv[1]);
   }

diff --git a/test/filectrl.test b/test/filectrl.test
index eea9a4773097d52772ba45b64fa659306f69059e..e2fc4c15bdad348975e3fc0e6fa99cc18a29c191 100644 (file)
--- a/test/filectrl.test
+++ b/test/filectrl.test
@@ -53,7 +53,7 @@ if {$tcl_platform(platform) eq "windows"} {
     db close
     forcedelete test2.db
     list $size $handle [expr {$handle != 0}]
     db close
     forcedelete test2.db
     list $size $handle [expr {$handle != 0}]

-  } {/^0 \{0 [0-9A-Fa-f]+\} 1$/}
+  } {/^0 ptr:[0-9A-Fa-f]+ 1$/}

 
   do_test filectrl-2.2 {
     sqlite3 db test2.db
 
   do_test filectrl-2.2 {
     sqlite3 db test2.db


@@ -65,8 +65,8 @@ if {$tcl_platform(platform) eq "windows"} {
     set handle [file_control_win32_get_handle db]
     db close
     forcedelete test2.db
     set handle [file_control_win32_get_handle db]
     db close
     forcedelete test2.db

-    list $size $handle [expr {$handle != 0}]
-  } {/^1\d+ \{0 [0-9A-Fa-f]+\} 1$/}
+    list $size $handle [regexp {^ptr:0+} $handle]
+  } {/^\d+ ptr:[0-9A-Fa-f]+ 1$/}

 }
 
 finish_test
 }
 
 finish_test

diff --git a/test/intarray.test b/test/intarray.test
index a0aa012dcaa3990c65424a77d424e9464189a257..b4b2dd3bfaf505113404207712a9e25cdde621ca 100644 (file)
--- a/test/intarray.test
+++ b/test/intarray.test
@@ -52,7 +52,7 @@ do_test intarray-1.1b {
   db eval {DROP TABLE ia1}
   set rc [catch {sqlite3_intarray_create db ia1} ia1]
   lappend rc $ia1
   db eval {DROP TABLE ia1}
   set rc [catch {sqlite3_intarray_create db ia1} ia1]
   lappend rc $ia1

-} {/0 ptr:0x[0-9A-Z]+/} 
+} {/0 ptr:(0x)?[0-9A-Z]+/} 

 
 do_test intarray-1.2 {
   db eval {
 
 do_test intarray-1.2 {
   db eval {

diff --git a/test/normalize.test b/test/normalize.test
index 29a5aabb2623b0cc9eaf9868664f7bbd7bce1360..8632a795742ca9e90d440619f164e7d74dab5918 100644 (file)
--- a/test/normalize.test
+++ b/test/normalize.test
@@ -107,7 +107,7 @@ do_test 212 {
 do_test 220 {
   set STMT [sqlite3_prepare_v3 $DB \
       "SELECT a, b FROM t1 WHERE b = 'a' ORDER BY a;" -1 2 TAIL]
 do_test 220 {
   set STMT [sqlite3_prepare_v3 $DB \
       "SELECT a, b FROM t1 WHERE b = 'a' ORDER BY a;" -1 2 TAIL]

-} {/^[0-9A-Fa-f]+$/}
+} {/^(ptr:)?(0x)?[0-9A-Fa-f]+$/}

 do_test 221 {
   sqlite3_normalized_sql $STMT
 } {SELECT a,b FROM t1 WHERE b=?ORDER BY a;}
 do_test 221 {
   sqlite3_normalized_sql $STMT
 } {SELECT a,b FROM t1 WHERE b=?ORDER BY a;}

diff --git a/test/trace3.test b/test/trace3.test
index 19f56221966bad99ef4fa9c7afc136f2fb70e6c5..8a1e723fafe0372691bab8ad8ec55658dae76ef1 100644 (file)
--- a/test/trace3.test
+++ b/test/trace3.test
@@ -195,7 +195,7 @@ do_test trace3-7.1 {
 
   set STMT [sqlite3_prepare_v2 $DB \
       "SELECT a, b FROM t1 WHERE b = ? ORDER BY a;" -1 TAIL]
 
   set STMT [sqlite3_prepare_v2 $DB \
       "SELECT a, b FROM t1 WHERE b = ? ORDER BY a;" -1 TAIL]

-} {/^ptr:0x[0-9A-Fa-f]+$/}
+} {/^ptr:(0x)?[0-9A-Fa-f]+$/}

 
 do_test trace3-8.1 {
   list [sqlite3_bind_null $STMT 1] [sqlite3_expanded_sql $STMT]
 
 do_test trace3-8.1 {
   list [sqlite3_bind_null $STMT 1] [sqlite3_expanded_sql $STMT]