Cygwin-centric test script tweaks from Jan Nijtmans.

FossilOrigin-Name: 9868615b7d41179672dde2eafff878d50cf9d647c7050ccf5103e385fd182fc2

diff --git a/manifest b/manifest
index c67c275604889657bfa9c8da72e4fe218efa8aba..f9bfb6d41cc1c0eaa33e0fa988bc97a7d0547095 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Cygwin-centric\sfixes\sfrom\sJan\sNijtmans.
-D 2025-03-06T13:38:07.006
+C Cygwin-centric\stest\sscript\stweaks\sfrom\sJan\sNijtmans.
+D 2025-03-06T13:49:27.683
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1471,7 +1471,7 @@ F test/misc8.test 08d2380bc435486b12161521f225043ac2be26f02471c2c1ea4cac0b1548ed
 F test/misuse.test 46d42ffdf375833ea5828796e56f84660344f7548659b493059f152f00e66840
 F test/mjournal.test 28a08d5cb5fb5b5702a46e19176e45e964e0800d1f894677169e79f34030e152
 F test/mmap1.test 18de3fd7b70a777af6004ca2feecfcdd3d0be17fa04058e808baf530c94b1a1d
-F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
+F test/mmap2.test dba452dc7db91e9df10f70bdd73dc4190c7b8ee7b5133b4684f04277ada0b9ac
 F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
 F test/mmap4.test 2e2b4e32555b58da15176e6fe750f17c9dcf7f93
 F test/mmapcorrupt.test 470fb44fe92e99c1d23701d156f8c17865f5b027063c9119dcfdb842791f4465
@@ -1484,7 +1484,7 @@ F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
 F test/mutex1.test 42cb5e244c3a77bb0ef2b967e06fa5e7ba7d32d90a9b20bed98f6f5ede185a25
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test 73ea63ab43668313e2f8cc9ef9e9a966672c7934f3ce76926fbe991235d07d91
-F test/nockpt.test 8c43b25af63b0bd620cf1b003529e37b6f1dc53bd22690e96a1bd73f78dde53a
+F test/nockpt.test e0ef4af9b35892de80515c2e45a54eb3c83623721f8bbc797450041a3cd3405f
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
 F test/normalize.test f23b6c5926c59548635fcf39678ac613e726121e073dd902a3062fbb83903b72
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
@@ -1513,14 +1513,14 @@ F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
 F test/orderby9.test 87fb9548debcc2cd141c5299002dd94672fa76a3
 F test/orderbyA.test df608e59efc2ef50c1eddf1a773b272de3252e9401bfec86d04b52fd973866d5
 F test/orderbyB.test 32576c7b138105bc72f7fbf33bd320ca3a7d303641fc939e0e56af6cba884b3d
-F test/oserror.test 1fc9746b83d778e70d115049747ba19c7fba154afce7cc165b09feb6ca6abbc5
+F test/oserror.test ee3fad06ec8671c4d047c2c92a567fc2e0e8161caaec7edd6d48325c5ac97f30
 F test/ossfuzz.c 9636dad2092a05a32110df0ca06713038dd0c43dd89a77dabe4b8b0d71096715
 F test/ossshell.c f125c5bd16e537a2549aa579b328dd1c59905e7ab1338dfc210e755bb7b69f17
 F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
 F test/pager1.test ffd885cdc98b986c9f746496508c0c4810ed0eaade3575ddf53c222e85880552
 F test/pager2.test c0ede15952b607f9a38f653acdfa73c19e657958e9104aab1a71950ea7b71831
 F test/pager3.test 4e9a83d6ca0838d7c602c9eb93d1357562d9059c1e02ffb138a8271020838370
-F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
+F test/pager4.test 98837730b0d3fe8002706e1c7c3b2e43db19f9a369d671c20307473c39efc64e
 F test/pagerfault.test 63c5da625562c66345ab4528790327ca63db2f6f9cbae2aba8cb7c51de3d1628
 F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
 F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
@@ -1648,7 +1648,7 @@ F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d
 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd
 F test/shell9.test 8742a5b390cdcef6369f5aa223e415aa4255a4129ef249b177887dc635a87209
 F test/shellA.test 079c05c11947ade4ea8d51053d3abb687ec96a3dce6680d01838519b705190c5
-F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
+F test/shmlock.test ca560c2cd8197ca2c75be31060918c39fb1cd44de9434b61d1b376b96c0e42fa
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 F test/shrink.test 2668e607dcdfa19c52828c09b69685b38da793856582ae31debf79d90c7bbbdc
@@ -1857,7 +1857,7 @@ F test/tkt3357.test 77c37c6482b526fe89941ce951c22d011f5922ed
 F test/tkt3419.test 1bbf36d7ea03b638c15804251287c2391f5c1f6b
 F test/tkt3424.test 61f831bd2b071bd128fa5d00fbda57e656ca5812
 F test/tkt3442.test c9d95b4c8f4f35a51b523f35d2afd0ce124937812af296545ad551ff763504fd
-F test/tkt3457.test 5b9cc2b6cbbf896e9b973db83f6520f43f326f4d08604372a7b0379625e28412
+F test/tkt3457.test adf048188761581124a2f0f91f9d23a5b76fb425270ecbfd73c9c7949fa10786
 F test/tkt3461.test 228ea328a5a21e8663f80ee3d212a6ad92549a19
 F test/tkt3493.test 1686cbde85f8721fc1bdc0ee72f2ef2f63139218
 F test/tkt3508.test d75704db9501625c7f7deec119fcaf1696aefb7d
@@ -1935,7 +1935,7 @@ F test/unionvtab.test e1704ab1b4c1bb3ffc9da4681f8e85a0b909fd80b937984fc94b27415a
 F test/unionvtabfault.test e8759f3d14fb938ce9657e2342db34aeac0fb9bc1692b0d1ebb0069630151d06
 F test/unique.test 93f8b2ef5ea51b9495f8d6493429b1fd0f465264
 F test/unique2.test 3674e9f2a3f1fbbfd4772ac74b7a97090d0f77d2
-F test/unixexcl.test d936ba2b06794018e136418addd59a2354eeae97
+F test/unixexcl.test d2366ef2d3d95249314307861d748924d9ab4f24305541159a08be61ccd4a9ee
 F test/unordered.test 0edaf3411d300693bca595897c5201421c6c5ec787990a1dfe2f7f60ae93f1e2
 F test/update.test 85d3f46d0863033370bd881b1097f5694369a8730e53c5f85d96f32b7b310b47
 F test/update2.test 67455bc61fcbcf96923c45b3bc4f87bc72be7d67575ad35f134906148c7b06d3
@@ -2002,7 +2002,7 @@ F test/wal3.test 5de023bb862fd1eb9d2ad26fa8d9c43abb5370582e5b08b2ae0d6f93661bc31
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
-F test/wal64k.test 2a525c0f45d709bae3765c71045ccec5df7d100ccbd3a7860fdba46c9addb965
+F test/wal64k.test bb8c52f0140aae1de877ffed86e2a97d903f98cf9ac263f185d51c58cde92327
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
@@ -2019,7 +2019,7 @@ F test/walfault.test 09b8ad7e52d2f54bce50e31aa7ea51412bb9f70ac13c74e669ddcd8b48b
 F test/walfault2.test e039ac66c78d5561683cacde04097213cdad3b58e2b3f3fe1112862217bfd915
 F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 F test/walmode.test cd6e7cff618eaaa5910ce57c3657aa50110397f86213886a2400afb9bfec7b7b
-F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
+F test/walnoshm.test 844b3eb7d8e8ee76c834ef723babec57b0be51fa52ef7e321c289ed0fe3cddc2
 F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 F test/walpersist.test 8d78a1ec91299163451417b451a2bac3481f8eb9f455b1ca507a6625c927ca6e
 F test/walprotocol.test 1b3f922125e341703f6e946d77fdc564d38fb3e07a9385cfdc6c99cac1ecf878
@@ -2213,11 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f31042595b8f8a378db9778c9a8223b07ec02cf2f528581ba43bf72b5b03c964
-R e2636937135f5b30145a26001dbda091
-T *branch * cygwin-fixes
-T *sym-cygwin-fixes *
-T -sym-trunk *
+P 205979813c7300debb5f1ba270583ef2f08e069d6d01865b5910702889a5c1ed
+R cf9d3169fa65916adb28e6e37c49539f
 U stephan
-Z a07a11eb75fd35bca8f25a9808dd0343
+Z d2a6db88a6d1b9751782d00b8ec047d5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c2a7b0c1e24e5ef64e552da650b9cb1f57472645..8930484fdf0af1532b164ef1f226f12923d539de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-205979813c7300debb5f1ba270583ef2f08e069d6d01865b5910702889a5c1ed
+9868615b7d41179672dde2eafff878d50cf9d647c7050ccf5103e385fd182fc2

diff --git a/test/mmap2.test b/test/mmap2.test
index 1f8346b915eac5b29d5d4a51d27bf9d793ec2bc0..df96671dfb4b2f14a63335491dc7b5a98a176bd8 100644 (file)
--- a/test/mmap2.test
+++ b/test/mmap2.test
@@ -21,10 +21,10 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix mmap2
 
-if {$::tcl_platform(platform)!="unix" || [test_syscall defaultvfs] != "unix"} {
+if {[llength [info commands test_syscall]]==0} {
   finish_test
   return
-}
+} 
 ifcapable !mmap {
   finish_test
   return

diff --git a/test/nockpt.test b/test/nockpt.test
index 4cc61d11e112e4d91226dfa00f6dbbf54e8d1dcd..84b2953e67435dac904241bd817e3a0aed2aaea7 100644 (file)
--- a/test/nockpt.test
+++ b/test/nockpt.test
@@ -102,7 +102,9 @@ sqlite3_close_v2 $::db1
 
 # Delete the database, wal and shm files.
 #
-forcedelete test.db test.db-wal test.db-shm
+catch {forcedelete test.db}
+catch {forcedelete test.db-wal}
+catch {forcedelete  test.db-shm}
 
 # Open and populate a new database file at the same file-system location
 # as the one just deleted. Contrive a partial checkpoint on it.

diff --git a/test/oserror.test b/test/oserror.test
index a51301cc52b67b5417db04bbc00a9bfee40d0fd9..43d72569d9ffbe467f0dd8983b874035f9252393 100644 (file)
--- a/test/oserror.test
+++ b/test/oserror.test
@@ -16,7 +16,10 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-if {$::tcl_platform(platform)!="unix"} { finish_test ; return }
+if {[llength [info commands test_syscall]]==0} {
+  finish_test
+  return
+} 
 set ::testprefix oserror
 
 db close

diff --git a/test/pager4.test b/test/pager4.test
index 2cf73d1b1752293f4cdf4d2038e041f5186a7ec3..bec5bb645d46e906db8b3f1669ff7d8014713ac3 100644 (file)
--- a/test/pager4.test
+++ b/test/pager4.test
@@ -13,7 +13,7 @@
 # is unlinked or renamed out from under SQLite.
 #
 
-if {$tcl_platform(platform)!="unix"} return
+if {$tcl_platform(os)=="Windows NT"} return
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl

diff --git a/test/shmlock.test b/test/shmlock.test
index 89b29fd7ac9e3b0bc7df87089f3b6fbd73d82db4..69c79ecc0aac68bf721cf35e718aa12965b6d440 100644 (file)
--- a/test/shmlock.test
+++ b/test/shmlock.test
@@ -114,7 +114,7 @@ sqlite3 db0 test.db
 sqlite3 db1 test.db
 do_test 3.1 { execsql { SELECT * FROM t1 } db0 } {1 2}
 do_test 3.2 { execsql { SELECT * FROM t1 } db1 } {1 2}
-if {$tcl_platform(platform)=="windows"} {
+if {$tcl_platform(os)=="Windows NT"} {
   set isWindows 1
 } else {
   set isWindows 0

diff --git a/test/tkt3457.test b/test/tkt3457.test
index 0273494639dfa43032085f7d8bacf1f093fcb036..17b6c72cd4a2e4fd0673bcccf3c146ddd468d8c3 100644 (file)
--- a/test/tkt3457.test
+++ b/test/tkt3457.test
@@ -15,10 +15,10 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-if {$tcl_platform(platform) != "unix"} {
+if {[llength [info commands test_syscall]]==0} {
   finish_test
   return
-}
+} 
 if {[atomic_batch_write test.db]} {
   finish_test
   return

diff --git a/test/unixexcl.test b/test/unixexcl.test
index 8e9c4644d154f090dd804b4979cb6b7010a667a2..c24945e5e3357d13c6b1a4d1284b6d6db3216616 100644 (file)
--- a/test/unixexcl.test
+++ b/test/unixexcl.test
@@ -18,7 +18,7 @@ source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 source $testdir/malloc_common.tcl
 
-if {$::tcl_platform(platform)!="unix" || [info commands test_syscall]==""} {
+if {[llength [info commands test_syscall]]==0} {
   finish_test
   return
 } 

diff --git a/test/wal64k.test b/test/wal64k.test
index 8ff8e4b77c4d8a8467c05d56e7a0e9e05846c50c..bacb14328afcca06f54fc90fb271e08a5bda4c02 100644 (file)
--- a/test/wal64k.test
+++ b/test/wal64k.test
@@ -19,10 +19,10 @@ set testprefix wal64k
 
 ifcapable !wal {finish_test ; return }
 
-if {$tcl_platform(platform) != "unix"} {
+if {[llength [info commands test_syscall]]==0} {
   finish_test
   return
-}
+} 
 
 db close
 test_syscall pagesize 65536

diff --git a/test/walnoshm.test b/test/walnoshm.test
index d4082178dde26c7427a8c6aa275cd3413efd7d7d..f546c29b137445f8b060611966a67f6a02682b92 100644 (file)
--- a/test/walnoshm.test
+++ b/test/walnoshm.test
@@ -104,6 +104,7 @@ do_test 2.1.5 {
 } {exclusive delete a b c d e f g h}
 
 do_test 2.2.1 {
+  db2 close
   forcecopy test.db     test2.db
   forcecopy test.db-wal test2.db-wal
   sqlite3 db3 test2.db -vfs tvfsshm