Merge trunk. Some additional test-fixes for Cygwin

FossilOrigin-Name: b36adadfa202fb8951149561471c3e01085d31e1837c99806f308f234cd24a8e

diff --cc manifest
index 53f357a5f3693890d6fe542c6ab0d24859cf9d7c,410f3e551396371f537b44a824c79b9128dede24..395837b4e99be7cfe4df80223e45c9d8623ad6c3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,5 +1,6 @@@
- C Merge\strunk\sinto\scygwin-fixes\sbranch.\sAdd\s.fossil-settings/binary-glob\sto\ssquelch\swarnings\sabout\s*.db\sfiles\son\sCygwin.
- D 2025-03-26T00:02:15.069
 -C Fix\san\soff-by-one\sbug\sin\sthe\s".dbtotxt"\scommand\sfrom\sthe\sshell\sthat\sresults\nin\sincorrect\soutput.
 -D 2025-03-27T10:59:18.433
++C Merge\strunk.\sSome\sadditional\stest-fixes\sfor\sCygwin
++D 2025-03-27T14:13:12.785
 +F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -771,8 -770,8 +771,8 @@@ F src/os_common.h 6c0eb8dd40ef3e12fe585
  F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
  F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
  F src/os_unix.c 410185df4900817c218c0efdb8064b3481af88cb3f7cea7392f820b6eebc7889
- F src/os_win.c 9862c27eba30a684d51b07b542e3b286346edf14e2b92b6b1391df43bd1b611e
 -F src/os_win.c f4bc31a181306f61f0597c8445971081e1f1ee98a17f86587a92fe56be799294
 -F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
++F src/os_win.c caab8bc13f1d64a2ba6b8af35d660ffe25083df3493d9082d7a461a5e9950a50
 +F src/os_win.h 4c247cdb6d407c75186c94a1e84d5a22cbae4adcec93fcae8d2bc1f956fd1f19
  F src/pager.c 9fbb541b46125dfa8914827575e6bb4d15048caa008073b1709112d495d7983b
  F src/pager.h 6137149346e6c8a3ddc1eeb40aee46381e9bc8b0fcc6dda8a1efde993c2275b8
  F src/parse.y e426d7323311554c75b0aebc426d0fe3c88d9777ffefed236f343ad9e661dc4c
@@@ -794,29 -793,29 +794,29 @@@ F src/sqliteInt.h 96133c5b4371629b30644
  F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
  F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
  F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 -F src/tclsqlite.c 254e69d6b4bc185ca2a3b186a92bda186aec9038063ebb9247b9b3181d4b4d4f
 +F src/tclsqlite.c 5875b959c3262d93b32893540c40d4ebb111495adc80db3ee0ddd440966ddcd5
  F src/tclsqlite.h 65e2c761446e1c9fa0342b7d2612a703483643c8b6a316d12a65b745a4727395
 -F src/test1.c ba7b93478a6a7a3f48ec5507f28bc662636ac5d9f9791700d3648a8e788f0bb2
 -F src/test2.c 7ebc518e6735939d8979273a6f7b1d9b5702babf059f6ad62499f7f60a9eb9a3
 -F src/test3.c e7573aa0f78ee4e070a4bc8c3493941c1aa64d5c66d4825c74c0f055451f432b
 -F src/test4.c 13e57ae7ec7a959ee180970aef09deed141252fe9bb07c61054f0dfa4f1dfd5d
 -F src/test5.c bb87279ed12e199486894e6c83e58dc8cd1de9524ace171d59219d3ab696a0c1
 -F src/test6.c 763b92489f11f4a77b773f0d3b8369ab0edd5292ac794043062c337019f12d8a
 +F src/test1.c e89a11192dd15da20e8f7dc0731297182b2fff56cf4afe6ca6f9aeab890595c5
 +F src/test2.c 62f0830958f9075692c29c6de51b495ae8969e1bef85f239ffcd9ba5fb44a5ff
 +F src/test3.c 432646f581d8af1bb495e58fc98234380250954f5d5535e507fc785eccc3987a
 +F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0
 +F src/test5.c 38fa635a70a94f2aa8b47ecbab15d821386205d27ad4159c3551ab3ba45efa11
 +F src/test6.c 9722054d37257459f1b8988e59e7db1dd630bfb291f16b2759764e778a9d1899
  F src/test8.c 206d8f3cc73950d252906656e2646b5de0d580b07187b635fcb3edd8c2c5fbc0
 -F src/test9.c 7a708ad27f8fda79113e5e15de66632710958c401e64c2f22bc04e2f5a7a1b62
 +F src/test9.c df9ddc7db6ef1b8cf745866ee229090779728bcbe660c7f297d3127ab21d92af
  F src/test_autoext.c 14d4bbd3d0bd1eec0f6d16b29e28cf1e2d0b020d454835f0721a5f68121ac10f
 -F src/test_backup.c bd901e3c116c7f3b3bbbd4aae4ce87d99b400c9cbb0a9e7b4610af451d9719a7
 +F src/test_backup.c a2bfd90d2ff2511b8635507bdb30fa9b605ade19c16b533066cae3077f5bdb72
  F src/test_bestindex.c 3401bee51665cbf7f9ed2552b5795452a8b86365e4c9ece745b54155a55670c6
 -F src/test_blob.c bcdf6a6c22d0bcc13c41479d63692ef413add2a4d30e1e26b9f74ab85b9fb4d5
 +F src/test_blob.c 77b994e17f2c87055f44fd96c9a206c5a7155bae2cda2769af60c2f3582f962c
  F src/test_btree.c 28283787d32b8fa953eb77412ad0de2c9895260e4e5bd5a94b3c7411664f90d5
  F src/test_config.c 7f412406592794636d6226268e26d413850a9f799bc5f3c01afc2820b165fca8
--F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
++F src/test_delete.c d0e8f6dc55cfc98a7c27c057fb88d512260564bf0b611482656c68b8f7f401ed
  F src/test_demovfs.c 3efa2adf4f21e10d95521721687d5ca047aea91fa62dd8cc22ac9e5a9c942383
  F src/test_devsym.c 649434ed34d0b03fbd5a6b42df80f0f9a7e53f94dd1710aad5dd8831e91c4e86
 -F src/test_fs.c c411c40baba679536fc34e2679349f59d8225570aed3488b5b3ef1908525a3d5
 +F src/test_fs.c 6711fd4c6c05914b613cfc99918a24978452f999ce03fc8f89c9794c03b20a5b
  F src/test_func.c 858d4dddb7acf88222ebcba7cffb585f6dde83e4a15b838c0d05ccdf8d5219b9
 -F src/test_hexio.c 7449504e4bde876ba91b202617a9228c7c8c2e7bd8b957302f3803ac0e9e353c
 -F src/test_init.c 17313332d58e90defc527129d5eda4a08bd6b6e8de7207a231523c8d98fb445e
 +F src/test_hexio.c a90baa0a8ab5e7cfe2216a61c9a31cfd1f8378353a3d23e25fa94c09aa755bb0
 +F src/test_init.c 1649e02448f536e53172f6b1ff873254fe9a0c6c8a4502a2d25c0cc7b11945ea
  F src/test_intarray.c 3fcf8ca7bb5c8776ea83f6aa9b66f8df0d1f37a99207b0097c8486f9c15cedbf
  F src/test_intarray.h 6c3534641108cd1bea517a8e117dcba237081310a29a4c35bd2190caa8972293
  F src/test_journal.c a0b9709b2f12b1ec819eea8a1176f283bca6d688a6d4a502bd6fd79786f4e287
@@@ -917,7 -916,7 +917,7 @@@ F test/analyzeD.test 485f621cfd2ef0a8f8
  F test/analyzeE.test d2ec7921c162cdc33ac8e7eb01f9ebf78100610af7c94c8552bbf551de1fb397
  F test/analyzeF.test 40b5cc3ad7b10e81020d7ca86f1417647ecfae7477cfd88acc5aa7ae1068f949
  F test/analyzeG.test 623be33038c49648872746c8dd8b23b5792c08fef173c55e82f1b12fca259852
--F test/analyzer1.test 459fa02c445ddbf0101a3bad47b34290a35f2e49
++F test/analyzer1.test 583c8cb9b22b036b4c3553fece5492b7ad2ccb0a38ddebf6bc90f701460ab28c
  F test/atof1.test bd21c4a0e718ab1470de07a2a79f2544d7903be34feebcc80de04beee4807b00
  F test/atomic.test 065a453dde33c77ff586d91ccaa6ed419829d492dbb1a5694b8a09f3f9d7d061
  F test/atomic2.test b6863b4aa552543874f80b42fb3063f1c8c2e3d8e56b6562f00a3cc347b5c1da
@@@ -2070,9 -2069,9 +2070,9 @@@ F test/wherelimit2.test b9e4bfe7b4d7c2f
  F test/wherelimit3.test 22d73e046870cf8bbe15573eda6b432b07ebe64a88711f9f849c6b3667c1fae6
  F test/widetab1.test c296a98e123762de79917350e45fa33fdf88577a2571eb3a64c8bf7e44ef74d1
  F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2aeee74
--F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c
--F test/win32longpath.test c5d149ab60a3052fa84b3df12ff655d703bfdfd48eed9854b14945d4d0bf3ddd
--F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
++F test/win32lock.test 4fc496691504d90621157aa43b1155a1461347261ad182c3e3d5923f4e0b879c
++F test/win32longpath.test df477a2891bd6a1a4e78e43290ea219a777da85eb2590092e36da65f2fb5f1cf
++F test/win32nolock.test 95854dc0206b8a95e4aee15a76acc082767b38f079b2e24676aed6cbb0f32798
  F test/window1.test 79dc3b9a2226f622d7e104a1fc750d1c4c3c08d6147b59085bdbe05352947ffa
  F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
  F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
@@@ -2216,8 -2215,8 +2216,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 83c34decbe336c76062e6b1bfe4c2e8f786841a4b6efa001747e786e872c8c71 1f98fc07fdf06d699ffbf1521b0b5e937a582017e4325bd994b488e06becbecc
- R de2202eb83cd3308bb9095ebe2525c12
- U stephan
- Z 7d9ccaf76dafc30f1ae03a1dfceab1ce
 -P d25c8a6222d4e3f20c137b1490572ad491d9c404ff12947d5867c3e00fcb615c
 -R 7f1dc2197ed34b61300fd57f99c67793
 -U drh
 -Z 6f6d82890663e463e31bf8fc619d730c
++P a8328b921c5504eceacade417e16e713999eff63978caf3418fd79501590b1cb 2345094e879c5538bfea005785ce0848e6d565a49bcb48b323c258d00ccbe9b8
++R cbf5c3bd266729f6200f5b597285d129
++U jan.nijtmans
++Z 90750b6144fd74824d9a8b0a82132288
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 16e22e682dd6b23e96b80faf6f33601ed94336e6,a4c3c5b00bc0131dd1234120cff5587d242b3755..d150f0a17d16e2e52ccdef2d8dd8426770206929
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a8328b921c5504eceacade417e16e713999eff63978caf3418fd79501590b1cb
 -2345094e879c5538bfea005785ce0848e6d565a49bcb48b323c258d00ccbe9b8
++b36adadfa202fb8951149561471c3e01085d31e1837c99806f308f234cd24a8e

diff --cc src/os_win.c
Simple merge

diff --cc src/test_delete.c
index 68fdbc6a757b2d50f256866fbd5fdfb60191d242,68fdbc6a757b2d50f256866fbd5fdfb60191d242..3f34a72c46b64dc8d4e8775446fb6d83e48dec1a
--- 1/src/test_delete.c
--- 2/src/test_delete.c
+++ b/src/test_delete.c
@@@ -63,7 -63,7 +63,7 @@@ static int sqlite3DeleteUnlinkIfExists
    int *pbExists
  ){
    int rc = SQLITE_ERROR;
--#if SQLITE_OS_WIN
++#ifdef _WIN32
    if( pVfs ){
      if( pbExists ) *pbExists = 1;
      rc = pVfs->xDelete(pVfs, zFile, 0);
@@@ -115,7 -115,7 +115,7 @@@ SQLITE_API int sqlite3_delete_database
      { "%s-wal%03d",     SQLITE_MULTIPLEX_WAL_8_3_OFFSET, 1 },
    };
  
--#ifdef SQLITE_OS_WIN
++#ifdef _WIN32
    sqlite3_vfs *pVfs = sqlite3_vfs_find("win32");
  #else
    sqlite3_vfs *pVfs = 0;

diff --cc test/analyzer1.test
index 51b5f8b6af52b64977798cfe3648faa31cf0a96a,51b5f8b6af52b64977798cfe3648faa31cf0a96a..a9239d61e162503a6f31ec3b0a8120c4b2676af8
--- 1/test/analyzer1.test
--- 2/test/analyzer1.test
+++ b/test/analyzer1.test
@@@ -19,7 -19,7 +19,7 @@@ ifcapable !vtab 
    return
  }
  
--if {$tcl_platform(platform)=="windows"} {
++if {$tcl_platform(os)=="Windows NT"} {
    set PROG "sqlite3_analyzer.exe"
  } else {
    set PROG "./sqlite3_analyzer"

diff --cc test/win32lock.test
index fbb2dd13cd4f7c5b1764a689769e70fba71ec962,fbb2dd13cd4f7c5b1764a689769e70fba71ec962..96cdfa7fd84fa1b80009e4ed05fd43ae523e1dff
--- 1/test/win32lock.test
--- 2/test/win32lock.test
+++ b/test/win32lock.test
@@@ -15,7 -15,7 +15,7 @@@
  # TESTRUNNER: slow
  #
  
--if {$tcl_platform(platform)!="windows"} return
++if {$tcl_platform(os) ne "Windows NT"} return
  
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl

diff --cc test/win32longpath.test
index b948de79fa41d69639c804b95be80251b7535563,b948de79fa41d69639c804b95be80251b7535563..419a371f1864db40d31d6599cc6e16517c01ab9f
--- 1/test/win32longpath.test
--- 2/test/win32longpath.test
+++ b/test/win32longpath.test
@@@ -13,7 -13,7 +13,7 @@@
  # by the "win32-longpath" VFS.
  #
  
--if {$tcl_platform(platform)!="windows"} return
++if {$tcl_platform(os) ne "Windows NT"} return
  
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl

diff --cc test/win32nolock.test
index 8128860392f762072c6aca6e88de0cb40eabd5a6,8128860392f762072c6aca6e88de0cb40eabd5a6..e6ff548b4693a25529679292b6bb0229f5282df2
--- 1/test/win32nolock.test
--- 2/test/win32nolock.test
+++ b/test/win32nolock.test
@@@ -11,7 -11,7 +11,7 @@@
  # This file implements regression tests for SQLite library.
  #
  
--if {$tcl_platform(platform)!="windows"} return
++if {$tcl_platform(os) ne "Windows NT"} return
  
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl