From: dan <Dan Kennedy>
Date: Fri, 4 Nov 2022 16:39:39 +0000 (+0000)
Subject: Fixes to recover module test scripts so that they may be used with SQLITE_DEFAULT_AUT... 
X-Git-Tag: version-3.40.0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80dbd818f2f24750af783f29fb16da563d76f6e3;p=thirdparty%2Fsqlite.git

Fixes to recover module test scripts so that they may be used with SQLITE_DEFAULT_AUTOVACUUM and SQLITE_SECURE_DELETE builds.

FossilOrigin-Name: 0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
---

diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index e942192827..26bbe322a1 100644
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -147,7 +147,6 @@ do_recover_test 2.4.1 {
   2 2 3 {} 8 9 7
 }
 
-breakpoint
 do_execsql_test 2.5 {
   CREATE TABLE x1(a, b, c);
   WITH s(i) AS (
@@ -165,17 +164,19 @@ do_recover_test 2.5.1 {
   2 2 3 {} 8 9 7
 }
 
-do_test 2.6 {
-  forcedelete test.db2
-  set R [sqlite3_recover_init db main test.db2]
-  $R config lostandfound lost_and_found
-  $R config freelistcorrupt 1
-  $R run
-  $R finish
-  sqlite3 db2 test.db2
-  execsql { SELECT count(*) FROM lost_and_found_1; } db2
-} {103}
-db2 close
+ifcapable !secure_delete {
+  do_test 2.6 {
+    forcedelete test.db2
+    set R [sqlite3_recover_init db main test.db2]
+    $R config lostandfound lost_and_found
+    $R config freelistcorrupt 1
+    $R run
+    $R finish
+    sqlite3 db2 test.db2
+    execsql { SELECT count(*) FROM lost_and_found_1; } db2
+  } {103}
+  db2 close
+}
 
 #-------------------------------------------------------------------------
 breakpoint
diff --git a/ext/recover/recoverpgsz.test b/ext/recover/recoverpgsz.test
index 8d064a4e9c..1a91f08459 100644
--- a/ext/recover/recoverpgsz.test
+++ b/ext/recover/recoverpgsz.test
@@ -23,6 +23,7 @@ foreach {pgsz bOverflow} {
 } {
   reset_db
   execsql "PRAGMA page_size = $pgsz"
+  execsql "PRAGMA auto_vacuum = 0"
   do_execsql_test 1.$pgsz.$bOverflow.1 {
     CREATE TABLE t1(a, b, c);
     CREATE INDEX i1 ON t1(b, a, c);
diff --git a/manifest b/manifest
index 4e680ffbc0..938d3cff8e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sTcl\stests\sso\sthat\sthey\sagain\sbuild\sand\srun\swith\sSQLITE_OMIT_VIRTUALTABLE\sdefined.
-D 2022-11-04T15:17:14.910
+C Fixes\sto\srecover\smodule\stest\sscripts\sso\sthat\sthey\smay\sbe\sused\swith\sSQLITE_DEFAULT_AUTOVACUUM\sand\sSQLITE_SECURE_DELETE\sbuilds.
+D 2022-11-04T16:39:39.210
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -393,8 +393,8 @@ F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f3945
 F ext/recover/recovercorrupt2.test 74bef7dd2d7dd4856f3da21be6e213d27da44827e0f5f0946ca0325b46d163ed
 F ext/recover/recoverfault.test 9d9f88eeb222615a25e7514f234c950d46bee20d24cd8db49d8fff8d650dcfe1
 F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539ccabf63623e7bb7e09
-F ext/recover/recoverold.test b0eeb4507cb5dba2ba7dfffe4c6e8c82bd14beaf718b227d647f21b5341eb8b4
-F ext/recover/recoverpgsz.test 481abf7d584cd67daa3ab72f65ff943b07c3887d206cc1c73d914b965596d8ca
+F ext/recover/recoverold.test 55a06e18e79a702e778c63324261fce2a0911089444384a97c423c05c42d4cab
+F ext/recover/recoverpgsz.test 3658ab8e68475b1bb87d6af88baa04551c84b73280a566a1be847182410ffc58
 F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
 F ext/recover/recoverslowidx.test 7e1bd4b1a201d94f39da436a9606047a352d7cbad69ac8f4d46495a46e993fe3
 F ext/recover/recoversql.test e66d01f95302a223bcd3fd42b5ee58dc2b53d70afa90b0d00e41e4b8eab20486
@@ -1409,7 +1409,7 @@ F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rbu.test 168573d353cd0fd10196b87b0caa322c144ef736
 F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
-F test/recover.test cd81539661b9a6263d68f7bfd1440f4ac0aeb68f0fa0370db32a9e706da89de7
+F test/recover.test f90e776adeb6b5da41cee56aa2aaa995c5d1d3c7b5b99dffb090041f12f8e3e5
 F test/regexp1.test 83c631617357150f8054ca1d1fed40a552b0d0f8eb7a7f090c3be02cee9f9913
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
@@ -2054,8 +2054,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cd7e3568a9b0c0f5ef5ca8a29c55cefe2bbad2dbc88a3718a87bb24a8ada3b7f
-R bd8a5ca9186cd7d971a738eb8929f158
+P 06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
+R 6a7f92408352b77a850cadea400d3dbe
 U dan
-Z 3cd700d63552d3b4d0ea3e514d09d144
+Z bd09347f876f10f602844e0bea6358b0
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9acb9ffd75..12fed04857 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06a9dbea40c8a0cdfae6b127a1ce1cba0547acdf1115c087e9b790a78c264b52
\ No newline at end of file
+0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
\ No newline at end of file
diff --git a/test/recover.test b/test/recover.test
index b60892459f..b7ff639403 100644
--- a/test/recover.test
+++ b/test/recover.test
@@ -141,6 +141,7 @@ do_recover_test 3.0
 
 #-------------------------------------------------------------------------
 reset_db 
+execsql { PRAGMA secure_delete = 0 }
 do_execsql_test 4.0 {
   CREATE TABLE t1(a, b, c);
   CREATE TABLE t2(d, e, f);