From: drh <> Date: Tue, 23 Nov 2021 22:28:09 +0000 (+0000) Subject: Changes a test pattern for RBU so that it works regardless of whether newer X-Git-Tag: version-3.37.0~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0906b6088b2fd830286ba9c4ce22970bd71059a;p=thirdparty%2Fsqlite.git Changes a test pattern for RBU so that it works regardless of whether newer TCL versions are used. FossilOrigin-Name: 5a9921c92ade9e13c3e49c50325c96e3264f3ad352a187387a960783a68bc9d3 --- diff --git a/ext/rbu/rbuvacuum2.test b/ext/rbu/rbuvacuum2.test index 6d6dfde9b9..c8fba6a22d 100644 --- a/ext/rbu/rbuvacuum2.test +++ b/ext/rbu/rbuvacuum2.test @@ -198,7 +198,11 @@ if {$::tcl_platform(platform)=="unix"} { } {SQLITE_OK} do_test 5.$tn.2 { file exists test.db-vacuum } 1 - do_test 5.$tn.3 { file attributes test.db-vacuum -permissions} $perm + # The result pattern might be 00xxx or 0oxxx depending on which + # version of TCL is being used. So make perm2 into a regexp that + # will match either + regsub {^00} $perm {0.} perm2 + do_test 5.$tn.3 { file attributes test.db-vacuum -permissions} /$perm2/ rbu close } } diff --git a/manifest b/manifest index 1722aa4718..0806b0ede3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\scompiler\swarning\sin\sthe\sdbserialize\smethod\sof\sthe\sTCL\sinterface. -D 2021-11-23T12:59:25.402 +C Changes\sa\stest\spattern\sfor\sRBU\sso\sthat\sit\sworks\sregardless\sof\swhether\snewer\nTCL\sversions\sare\sused. +D 2021-11-23T22:28:09.509 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -378,7 +378,7 @@ F ext/rbu/rbusave.test f4190a1a86fccf84f723af5c93813365ae33feda35845ba107b59683d F ext/rbu/rbusplit.test b37e7b40b38760881dc9c854bd40b4744c6b6cd74990754eca3bda0f407051e8 F ext/rbu/rbutemplimit.test 05ceefa90a2e26a99f40dd48282ed63a00df5e59c1f2bfd479c143e201a1b0ba F ext/rbu/rbuvacuum.test 55e101e90168c2b31df6c9638fe73dc7f7cc666b6142266d1563697d79f73534 -F ext/rbu/rbuvacuum2.test b8e5b51dc8b2c0153373d024c0936be3f66f9234acbd6d0baab0869d56b14e6b +F ext/rbu/rbuvacuum2.test 886add83fd74bcb02e6dd016ae5b585367bd58c5d0694c9d9ca7bdb1d1f578c2 F ext/rbu/rbuvacuum3.test 8addd82e4b83b4c93fa47428eae4fd0dbf410f8512c186f38e348feb49ba03dc F ext/rbu/rbuvacuum4.test a78898e438a44803eb2bc897ba3323373c9f277418e2d6d76e90f2f1dbccfd10 F ext/rbu/sqlite3rbu.c 3658f1c6603955c7426952b74a6896337b1f672d326cd565e5af20e18d5744f0 @@ -1933,7 +1933,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P e842d2085b295ef1c927611f5d3b211fb6b513ca2676c074fe90331da81734eb -R 84e34ff7b8bc6c0f74939a771980f470 +P ba71d030fef4cd4251dc882acc6897dbf9aaba498652900c491b082add87404f +R 6c2b65ee2f02c80b829baf0de2430b17 U drh -Z 7d98b1bd0552ee1a94c0194eec3dc3d7 +Z 5f3b75e87db7c12a4820a79fce965eb4 diff --git a/manifest.uuid b/manifest.uuid index 75c2b59de6..678e6081b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ba71d030fef4cd4251dc882acc6897dbf9aaba498652900c491b082add87404f \ No newline at end of file +5a9921c92ade9e13c3e49c50325c96e3264f3ad352a187387a960783a68bc9d3 \ No newline at end of file