From eeea6c76e342ad8a5e9475b8d17bc5abe5201263 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 12 Aug 2026 13:41:46 +0000 Subject: [PATCH] Fix tests recently added to nolock.test so that they run on windows. FossilOrigin-Name: bc57a14ab92dd8c247a893cf4cec7c0dccaa7e8407854a63aa3af699c60bacd5 --- manifest | 15 +++++++-------- manifest.tags | 1 - manifest.uuid | 2 +- test/nolock.test | 5 +++++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 3c5d81034e..0a64435f57 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\suse\sthe\spropagate-constant\soptimization\son\sa\sconstant\sthat\sis\nreally\sa\sfunction\sthat\smight\sreturn\sa\ssubtype. -D 2026-08-12T13:23:52.142 +C Fix\stests\srecently\sadded\sto\snolock.test\sso\sthat\sthey\srun\son\swindows. +D 2026-08-12T13:41:46.640 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1474,7 +1474,7 @@ F test/mutex1.test 2cdc320a3320521d73b8090a04a2245c1e625e5f90672882517bf5fedcec8 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660 F test/nan.test 73ea63ab43668313e2f8cc9ef9e9a966672c7934f3ce76926fbe991235d07d91 F test/nockpt.test 3db354270fc63b6871eebd40285d4c55324fb27be629c958adbff6d7fcaa8e14 -F test/nolock.test 848ac7792e7a04cc66f115756affbe064af29e14d5ffb60fcf1f456012cad84d +F test/nolock.test e4b279152d3650a28551194cb10142d38243b6381219713dd29f1707cc3fd5c6 F test/normalize.test 88ba50b75feaa16735ac780f675c9e111179f81da40e5e026ecb777664e18da2 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161 @@ -2218,9 +2218,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 39ae2b7c59505aeb198fb16eab3f3ea1b42eb35bc38776f3579000595cc9a572 -R 774b2145af7750957062abcec5d949e5 -T +sym-bug-2026-08-12T09:26:04Z * -U drh -Z 223440431b2055c5b5149bf02c96c9c2 +P a5bf606f3b76b66988d9f4ce97ca48827c2583e2e275f50a2fdfc8bb08719779 +R 342aeaea73bff13cd3fee87627e101e6 +U dan +Z ce76078d8da8d82b6a44e22b1ec84cf2 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.tags b/manifest.tags index 6d2261efec..bec971799f 100644 --- a/manifest.tags +++ b/manifest.tags @@ -1,3 +1,2 @@ branch trunk tag trunk -tag bug-2026-08-12T09:26:04Z diff --git a/manifest.uuid b/manifest.uuid index 2419156598..b9a92a0372 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a5bf606f3b76b66988d9f4ce97ca48827c2583e2e275f50a2fdfc8bb08719779 +bc57a14ab92dd8c247a893cf4cec7c0dccaa7e8407854a63aa3af699c60bacd5 diff --git a/test/nolock.test b/test/nolock.test index 5dce2780fb..03297d98ab 100644 --- a/test/nolock.test +++ b/test/nolock.test @@ -219,6 +219,11 @@ if {[permutation]!="inmemory_journal"} { } #------------------------------------------------------------------------- +# For these tests, move the pending-byte to later in the file. This way, +# all locks are placed past the end of the file, allowing it to be read +# at the OS level on windows even when locked. +# +sqlite3_test_control_pending_byte 0x10000000 reset_db do_execsql_test 5.0 {