From: drh <> Date: Mon, 3 Nov 2025 12:36:52 +0000 (+0000) Subject: Adjust the dbstatus2.test module so that it works on 32-bit builds in X-Git-Tag: major-release~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d95fffc9af41a92d10e11a8cb67788c23b1ee146;p=thirdparty%2Fsqlite.git Adjust the dbstatus2.test module so that it works on 32-bit builds in addition to 64-bit builds. FossilOrigin-Name: dcaaa71e750d56afde3e905aaf10729ec95e0ede00522e1b12af6b6345e744ac --- diff --git a/manifest b/manifest index 7ad1d88b25..b4d2f7937f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\stest\sresult\soutput\sfrom\stest/dbstatus2.test\smodule\sso\sthat\sit\nreports\sthe\sactual\svalue\sof\snTmpSpill\swhen\sthat\svalue\sis\sout\sof\srange. -D 2025-11-03T11:35:13.149 +C Adjust\sthe\sdbstatus2.test\smodule\sso\sthat\sit\sworks\son\s32-bit\sbuilds\sin\naddition\sto\s64-bit\sbuilds. +D 2025-11-03T12:36:52.549 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -1039,7 +1039,7 @@ F test/dblwidth-a.sql eb4141518610e52f931a55a984310075e98dc31eee5a28ae806b1e3537 F test/dbpage.test 63fab1eb026bada121107e53436fa749bbf83281dc9dea17af422f7a5c0f289f F test/dbpagefault.test ea39de2ca86041a9c6df1135645180a76d0a8da93ac159e2fafe38e39636530b F test/dbstatus.test 4a4221a883025ffd39696b3d1b3910b928fb097d77e671351acb35f3aed42759 -F test/dbstatus2.test 802fea9bf7af4fd51eb3c1a42d67727e138ac152fb6c87994c24c0293a2e9d9b +F test/dbstatus2.test a36518c0f0951d8fd5a3dc36f99948ad1af93fb7fc0d2e03e5bb5a643186cf52 F test/decimal.test a11b87a2c3294eb4c11b55f3168aeac63d683fa8ada35921a6ec1d511eff7648 F test/default.test c7124864cded213a3f118bc7e2e26f34b7c36dfa26cf6945cc8b7f5db1191277 F test/delete.test 2686e1c98d552ef37d79ad55b17b93fe96fad9737786917ce3839767f734c48f @@ -2171,8 +2171,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 0de0ba878b9ec572d76d47112a0124df9f234fbb7a69c5f5a76ce8c439b11f6f -R 1968274bbf1e417f86f9f4e6872cbb75 +P 382c8440d7a16eae49fa1644513ae045bfceb072d9b4005963f57f1a57fe94b2 +R 620d2da0d74086b6d0d72d3b95f59d97 U drh -Z 527852511fb97d6bf2b02340d6820864 +Z a3b63a4bccbd2246cde017a3b91f5fb7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6267878836..56186e5f91 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -382c8440d7a16eae49fa1644513ae045bfceb072d9b4005963f57f1a57fe94b2 +dcaaa71e750d56afde3e905aaf10729ec95e0ede00522e1b12af6b6345e744ac diff --git a/test/dbstatus2.test b/test/dbstatus2.test index b47ea5a5dc..526d8aa17b 100644 --- a/test/dbstatus2.test +++ b/test/dbstatus2.test @@ -129,7 +129,7 @@ if {$::TEMP_STORE<3} { CREATE TABLE data(a INTEGER, b BLOB); -- Insert 5-6 MB of data. - WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<50000 ) + WITH s(i) AS ( SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<75000 ) INSERT INTO data SELECT i, hex(randomblob(50)) FROM s; } @@ -138,7 +138,7 @@ if {$::TEMP_STORE<3} { do_test 4.4 { execsql { SELECT a, b FROM data ORDER BY a } set nTmpSpill [lindex [db_temp_spill db 1] 1] - expr {($nTmpSpill>5*1000*1000) && ($nTmpSpill<6*1000*1000)?"ok":$nTmpSpill} + expr {($nTmpSpill>7*1000*1000) && ($nTmpSpill<10*1000*1000)?"ok":$nTmpSpill} } ok # The previous test case reset the status value. @@ -147,7 +147,7 @@ if {$::TEMP_STORE<3} { do_test 4.6 { execsql { CREATE INDEX i1 ON data(a) } set nTmpSpill [lindex [db_temp_spill db 1] 1] - expr {($nTmpSpill>256*1000) && ($nTmpSpill<512*1000)?"ok":$nTmpSpill} + expr {($nTmpSpill>384*1000) && ($nTmpSpill<768*1000)?"ok":$nTmpSpill} } ok # The previous test case reset the status value.