From: dan <Dan Kennedy>
Date: Mon, 2 Jun 2025 18:09:46 +0000 (+0000)
Subject: Updates to new test cases to run with SQLITE_ENABLE_SETLK_TIMEOUT=2 builds.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfee69fbe46608fd662008c5d48e963eb8b7121b;p=thirdparty%2Fsqlite.git

Updates to new test cases to run with SQLITE_ENABLE_SETLK_TIMEOUT=2 builds.

FossilOrigin-Name: c6d3e3542fdf6a3428d3a2ec20c699c169ed53341dc782d81f7fe5944f769748
---

diff --git a/manifest b/manifest
index eb9fbb3209..a3a003af32 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\schanges\sinto\sthis\sbranch.
-D 2025-06-02T17:44:10.848
+C Updates\sto\snew\stest\scases\sto\srun\swith\sSQLITE_ENABLE_SETLK_TIMEOUT=2\sbuilds.
+D 2025-06-02T18:09:46.489
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -2036,8 +2036,8 @@ F test/walseh1.test bae700eb99519b6d5cd3f893c04759accc5a59c391d4189fe4dd6995a533
 F test/walsetlk.test 9079cd8ef82570b8cf0067f31e049a72bec353fb2d5f0cc88f1736dc42ba9704
 F test/walsetlk2.test 9097083633cdf55bf1098b694fb8651d0356d38fef28b869481d18029d7ceaf4
 F test/walsetlk3.test 1b82bd92dea7e58f498b4399b0b3d26773dd8ac5c74205ce4a23c207cb8e85fe
-F test/walsetlk_recover.test fb9f922aeceaece4b156fcea99751ca6dc6a9111d81cd018f891631d9b923bbb
-F test/walsetlk_snapshot.test 408e8b9b8b93366e8e3f1f748e755b21fb177c1b56210fe0c68e760ea1fb77f6
+F test/walsetlk_recover.test e09ae048a9e6c78af6907f16246bc0233f44c259bd14c98117e1728506d9cdc6
+F test/walsetlk_snapshot.test 0edadd7712d4c3a15e056741beb05651f158da363f975aa199b0310acf664ac8
 F test/walshared.test 42e3808582504878af237ea02c42ca793e8a0efaa19df7df26ac573370dbc7a3
 F test/walslow.test 0c51843836c9dcf40a5ac05aa781bfb977b396ee2c872d92bd48b79d5dd9aa23
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
@@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 14a18f4e3a3f35e636262a253364ab1e8054ed38c0c7fd482633522cbcf5ffc4 bf7be67e3fb7b75fc281997f7bf9aa69eaf4da6bdf2fefe359b12d25ec95f512
-R 9d4b9998d3f8edcfb9815d7e9467875d
+P 7d27451804e525190f8e67da75aaeb3bf2de677021f7566c6681398e60a88c72
+R 734e170a1ca2f4592eaf31a41ca11e3c
 U dan
-Z c11641e9268877729cb4210049f5ff6d
+Z e910bbd4a496935af0bc3162a47411df
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 70843368f7..0f403444be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d27451804e525190f8e67da75aaeb3bf2de677021f7566c6681398e60a88c72
+c6d3e3542fdf6a3428d3a2ec20c699c169ed53341dc782d81f7fe5944f769748
diff --git a/test/walsetlk_recover.test b/test/walsetlk_recover.test
index f5b142ec12..080ea638cd 100644
--- a/test/walsetlk_recover.test
+++ b/test/walsetlk_recover.test
@@ -18,7 +18,7 @@ source $testdir/lock_common.tcl
 set testprefix walsetlk_recover
 
 ifcapable !wal {finish_test ; return }
-ifcapable !setlk_timeout {finish_test ; return }
+# ifcapable !setlk_timeout {finish_test ; return }
 
 do_execsql_test 1.0 {
   PRAGMA journal_mode = wal;
@@ -69,7 +69,7 @@ proc sleep_callback {args} {
 }
 
 sqlite3 db test.db -vfs tvfs
-sqlite3_setlk_timeout db 500
+db timeout 500
 set tm [lindex [time {
   catch {
     db eval {SELECT * FROM t1}
@@ -88,9 +88,17 @@ do_execsql_test 1.4 {
 db close
 tvfs delete
 
-do_test 1.5 {
-  set ::sleep_count
-} 0
+# All SQLite builds should pass the tests above. SQLITE_ENABLE_SETLK_TIMEOUT=1
+# builds do so without calling the VFS xSleep method.
+if {$::sqlite_options(setlk_timeout)==1} {
+  do_test 1.5.1 {
+    set ::sleep_count
+  } 0
+} else {
+  do_test 1.5.2 {
+    expr $::sleep_count>0
+  } 1
+}
 
 finish_test
 
diff --git a/test/walsetlk_snapshot.test b/test/walsetlk_snapshot.test
index b0453f7e51..a1e97c5d3d 100644
--- a/test/walsetlk_snapshot.test
+++ b/test/walsetlk_snapshot.test
@@ -18,9 +18,18 @@ source $testdir/lock_common.tcl
 set testprefix walsetlk_snapshot
 
 ifcapable !wal {finish_test ; return }
-ifcapable !setlk_timeout {finish_test ; return }
 ifcapable !snapshot {finish_test; return}
 
+db close
+testvfs tvfs -fullshm 1
+sqlite3 db test.db -vfs tvfs
+tvfs script sleep_callback
+tvfs filter xSleep
+set ::sleep_count 0
+proc sleep_callback {args} {
+  incr ::sleep_count
+}
+
 do_execsql_test 1.0 {
   PRAGMA journal_mode = wal;
   CREATE TABLE t1(a, b);
@@ -84,5 +93,17 @@ sqlite3_snapshot_free $::snap
 
 vwait myvar
 
+# All SQLite builds should pass the tests above. SQLITE_ENABLE_SETLK_TIMEOUT=1
+# builds do so without calling the VFS xSleep method.
+if {$::sqlite_options(setlk_timeout)==1} {
+  do_test 1.5.1 {
+    set ::sleep_count
+  } 0
+} else {
+  do_test 1.5.2 {
+    expr $::sleep_count>0
+  } 1
+}
+
 finish_test