Tweaks to recover module test scripts to work with various permutations.

FossilOrigin-Name: 454c61e818f6941c9a23f6600e37828a3f2b2ad3c6dbc8d6223570aed5d9cd8b

diff --git a/ext/recover/recover1.test b/ext/recover/recover1.test
index dfe176fe85c2b22cddb1fbee20b019a917ebb105..75f5dba1ff33666edb2948c46f7c5427453f67bc 100644 (file)
--- a/ext/recover/recover1.test
+++ b/ext/recover/recover1.test
@@ -264,11 +264,13 @@ do_recover_test 14
 
 #-------------------------------------------------------------------------
 reset_db
-do_execsql_test 15.1 {
+execsql {
   PRAGMA journal_mode=OFF;
   PRAGMA mmap_size=10;
+}
+do_execsql_test 15.1 {
   CREATE TABLE t1(x);
-} {off 10}
+} {}
 do_recover_test 15 
 
 finish_test

diff --git a/ext/recover/recoverold.test b/ext/recover/recoverold.test
index 26bbe322a1586dd6d06dfb97471a6facf9afbfbe..c6acbb2f42771c61a1e550b8d27918de9c8a5846 100644 (file)
--- a/ext/recover/recoverold.test
+++ b/ext/recover/recoverold.test
@@ -63,7 +63,10 @@ proc do_recover_test {tn {tsql {}} {res {}}} {
   sqlite3 db2 test.db2
   db2 eval [join $::sqlhook ";"]
 
+
+  db cache flush
   if {$tsql==""} {
+  compare_dbs db db2
     uplevel [list do_test $tn.sql [list compare_dbs db db2] {}]
   } else {
     uplevel [list do_execsql_test -db db2 $tn.sql $tsql $res]

diff --git a/manifest b/manifest
index 0a05dc00ca998d35f1e5edf1a4f340d81aca71ef..d60d45244e08123ead9f7c72c70e5705518956eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\stest\scase\sfix\sfor\sauto-vacuum\sbuilds.
-D 2022-11-04T17:07:33.450
+C Tweaks\sto\srecover\smodule\stest\sscripts\sto\swork\swith\svarious\spermutations.
+D 2022-11-04T18:32:45.744
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -386,14 +386,14 @@ F ext/rbu/sqlite3rbu.c 8737cabdfbee84bb25a7851ecef8b1312be332761238da9be6ddb10c6
 F ext/rbu/sqlite3rbu.h 1dc88ab7bd32d0f15890ea08d23476c4198d3da3056985403991f8c9cd389812
 F ext/rbu/test_rbu.c 03f6f177096a5f822d68d8e4069ad8907fe572c62ff2d19b141f59742821828a
 F ext/recover/dbdata.c 1d5353d3af247c4e0656f8f88a80564aa840644c1177212dd11a186dce4ab213
-F ext/recover/recover1.test 5758c1900d8feacbdf9cc1f2796cfcb5715885a33e2ab14bdeeec8b7c938f576
+F ext/recover/recover1.test 02004eb8f9ec2825ba77e24742c18e45162cb21d27e76a3a435b83a759a1131a
 F ext/recover/recover_common.tcl a61306c1eb45c0c3fc45652c35b2d4ec19729e340bdf65a272ce4c229cefd85a
 F ext/recover/recoverclobber.test 3ba6c0c373c5c63d17e82eced64c05c57ccaf26c1abe1ca7141334022a79f32e
 F ext/recover/recovercorrupt.test 64c081ad1200ae77b447da99eb724785d6bf71715f394543dc7689642e92bf49
 F ext/recover/recovercorrupt2.test 74bef7dd2d7dd4856f3da21be6e213d27da44827e0f5f0946ca0325b46d163ed
 F ext/recover/recoverfault.test 9d9f88eeb222615a25e7514f234c950d46bee20d24cd8db49d8fff8d650dcfe1
 F ext/recover/recoverfault2.test 730e7371bcda769554d15460cb23126abba1be8eca9539ccabf63623e7bb7e09
-F ext/recover/recoverold.test 55a06e18e79a702e778c63324261fce2a0911089444384a97c423c05c42d4cab
+F ext/recover/recoverold.test 68db3d6f85dd2b98e785b6c4da4f5eea4bbe52ccf6674d9a94c7506dc92596aa
 F ext/recover/recoverpgsz.test 3658ab8e68475b1bb87d6af88baa04551c84b73280a566a1be847182410ffc58
 F ext/recover/recoverrowid.test f948bf4024a5f41b0e21b8af80c60564c5b5d78c05a8d64fc00787715ff9f45f
 F ext/recover/recoverslowidx.test 5205a9742dd9490ee99950dabb622307355ef1662dea6a3a21030057bfd81411
@@ -1385,7 +1385,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 650d89ab5aad0c9fab9325b11deca8662cb5e72f43e005073d35f12ad00eaca2
+F test/permutations.test 3e0d6eea70e5087f3240b1a2fe621b0c73445f38a262029f0a1d2d89564026f7
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -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 0e5597ce5353dea2cdb092b166b57ba1d60f8115eb468349f2b2869803691a2c
-R d1d62643ac88e13cebbaf7579524f719
+P c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
+R 96c1a1e097290369d58e43a186b26522
 U dan
-Z e9d84ba59d4f6ae1792a730414132be7
+Z 0f3def2d760a90c1360a62b337e54d9b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 700664af5feade23e98fa4db6c38bb197060dfda..85565b8a8499dd8461403e12e95333cbb7aeb718 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1c47eff48e0831b5aed987e90d797aee99caf1861fa8318c6c3ecfb108de7e6
\ No newline at end of file
+454c61e818f6941c9a23f6600e37828a3f2b2ad3c6dbc8d6223570aed5d9cd8b
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index 8a5484944af1997529164f415104ef9880f45974..add02d27c0afc2a869047872a1ec408ac38428f0 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -806,6 +806,8 @@ test_suite "inmemory_journal" -description {
   # This test depends on a successful recovery from the pager error 
   # state. Which is not possible with an in-memory journal
   fts5fault1.test
+
+  recoverpgsz.test
 }]
 
 ifcapable mem3 {