From: stephan Date: Wed, 26 Nov 2025 16:40:23 +0000 (+0000) Subject: Fix tests broken by the previous commit. X-Git-Tag: artiphishell~117^2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2348682e4e1ebdf9377902a222c5b1a7d6c89f53;p=thirdparty%2Fsqlite.git Fix tests broken by the previous commit. FossilOrigin-Name: 430d4d668fc2d151f20a02ddbbac7f884258af7fd1268d3aafb5f9e8eadf844b --- diff --git a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js index a603dfacfc..4fba3a1516 100644 --- a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js @@ -1322,11 +1322,12 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){ sqlite3.kvvfs.test = { pFileHandles, cache, + storageForZClass, KVVfsStorage }; } - if( globalThis.localStorage || globalThis.sessionStorage ){ + if( globalThis.Storage ){ /** Prior to version 2, kvvfs was only available in the main thread. We retain that for the v1 APIs, exposing them only in diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index 278632e8da..06f32d52f1 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -2886,8 +2886,8 @@ globalThis.sqlite3InitModule = sqlite3InitModule; test: function(sqlite3){ const capi = sqlite3.capi; if( isUIThread() ){ - T.assert( capi.sqlite3_js_kvvfs_clear ) - .assert( capi.sqlite3_js_kvvfs_size ); + T.assert( !!capi.sqlite3_js_kvvfs_size ) + .assert( !!capi.sqlite3_js_kvvfs_clear ); }else{ /* Historical behaviour retained not for compatibility but to help avoid some confusion between the v1 and v2 kvvfs diff --git a/manifest b/manifest index 7c8ee774ad..a53425dd10 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\ssome\sdead\scode.\sResolve\sthe\sremaining\skvvfs\sv1/v2\sAPI\scompatibility\sconfusion\sby\seliding\sthe\sv1\sAPI\sfrom\sWorkers\slike\swe've\salways\sdone.\sAdd\ssome\stests. -D 2025-11-26T16:27:11.737 +C Fix\stests\sbroken\sby\sthe\sprevious\scommit. +D 2025-11-26T16:40:23.269 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -600,7 +600,7 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 1041dd645e8e821c082b628cd8d9acf70c667 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89 F ext/wasm/api/sqlite3-opfs-async-proxy.js 9654b565b346dc609b75d15337f20acfa7af7d9d558da1afeb9b6d8eaa404966 F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d -F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 2129d852692514b87168c676daa9611ff470631fd9dd1850380bb339447ea6b8 +F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 5b0719367e0613f9b6bf3a449312dbe06234938ce566e7b1806cd44e8bbdee1f F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js a2eea6442556867b589e04107796c6e1d04a472219529eeb45b7cd221d7d048b F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 88ce2078267a2d1af57525a32d896295f4a8db7664de0e17e82dc9ff006ed8d3 F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 9097074724172e31e56ce20ccd7482259cf72a76124213cbc9469d757676da86 @@ -647,7 +647,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.c-pp.html 0e432ec2c0d99cd470484337066e8d27e7aee4641d97115338f7d962bf7b081a F ext/wasm/tester1.c-pp.html 52d88fe2c6f21a046030a36410b4839b632f4424028197a45a3d5669ea724ddb -F ext/wasm/tester1.c-pp.js 637365c25cee9fc598b0692abcfb74ff4eb96741fdbb37c0a3a4cd6c7865b669 +F ext/wasm/tester1.c-pp.js c58165ce63c1c20c6ff5276443d97a629ef3e04f461b3a265c6a36ff93b12954 F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2 @@ -2178,8 +2178,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P c18154bc9a7cf07d3902d74d27b4ca696929aae9e1abe031679bd5a42d759046 -R 0b5f71befded837e8498adc93b1e36b5 +P 450b4bcca6038be58a73ff15ff18b9d70df661fe0bd9777273e0db6fbce5f296 +R 1fce3bc8bc8cd3905cff1d9a17674e6f U stephan -Z 6151d9a6ceb918c4eb7ea5d986b2dc3c +Z a635990442def45b08444596d861233f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a74e468c5e..10161edac0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -450b4bcca6038be58a73ff15ff18b9d70df661fe0bd9777273e0db6fbce5f296 +430d4d668fc2d151f20a02ddbbac7f884258af7fd1268d3aafb5f9e8eadf844b